projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARC: mm: support 4 levels of page tables
[linux-2.6-microblaze.git]
/
block
/
blk-integrity.c
diff --git
a/block/blk-integrity.c
b/block/blk-integrity.c
index
c03705c
..
410da06
100644
(file)
--- a/
block/blk-integrity.c
+++ b/
block/blk-integrity.c
@@
-183,7
+183,6
@@
bool blk_integrity_merge_rq(struct request_queue *q, struct request *req,
return true;
}
return true;
}
-EXPORT_SYMBOL(blk_integrity_merge_rq);
bool blk_integrity_merge_bio(struct request_queue *q, struct request *req,
struct bio *bio)
bool blk_integrity_merge_bio(struct request_queue *q, struct request *req,
struct bio *bio)
@@
-212,7
+211,6
@@
bool blk_integrity_merge_bio(struct request_queue *q, struct request *req,
return true;
}
return true;
}
-EXPORT_SYMBOL(blk_integrity_merge_bio);
struct integrity_sysfs_entry {
struct attribute attr;
struct integrity_sysfs_entry {
struct attribute attr;
@@
-408,7
+406,7
@@
void blk_integrity_register(struct gendisk *disk, struct blk_integrity *template
bi->tuple_size = template->tuple_size;
bi->tag_size = template->tag_size;
bi->tuple_size = template->tuple_size;
bi->tag_size = template->tag_size;
-
disk->queue->backing_dev_info->capabilities |= BDI_CAP_STABLE_WRITES
;
+
blk_queue_flag_set(QUEUE_FLAG_STABLE_WRITES, disk->queue)
;
#ifdef CONFIG_BLK_INLINE_ENCRYPTION
if (disk->queue->ksm) {
#ifdef CONFIG_BLK_INLINE_ENCRYPTION
if (disk->queue->ksm) {
@@
-428,7
+426,7
@@
EXPORT_SYMBOL(blk_integrity_register);
*/
void blk_integrity_unregister(struct gendisk *disk)
{
*/
void blk_integrity_unregister(struct gendisk *disk)
{
-
disk->queue->backing_dev_info->capabilities &= ~BDI_CAP_STABLE_WRITES
;
+
blk_queue_flag_clear(QUEUE_FLAG_STABLE_WRITES, disk->queue)
;
memset(&disk->queue->integrity, 0, sizeof(struct blk_integrity));
}
EXPORT_SYMBOL(blk_integrity_unregister);
memset(&disk->queue->integrity, 0, sizeof(struct blk_integrity));
}
EXPORT_SYMBOL(blk_integrity_unregister);