diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-09 19:54:03 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-09 19:54:03 -0500 |
| commit | 2bc9a7e67e34a92446183d47286e60ac90fee19e (patch) | |
| tree | 70a00db7576aeccca3e88f5ff550439b7e81e24a | |
| parent | c7d5f129198f6b77d431dbce0d7670ccb229b7cd (diff) | |
| download | longterm-queue-4.8-2bc9a7e67e34a92446183d47286e60ac90fee19e.tar.gz | |
blk: integrity: transition from "->" to "." for info field
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/block-get-rid-of-blk_integrity_revalidate.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/queue/block-get-rid-of-blk_integrity_revalidate.patch b/queue/block-get-rid-of-blk_integrity_revalidate.patch index e8a54df..81a85c2 100644 --- a/queue/block-get-rid-of-blk_integrity_revalidate.patch +++ b/queue/block-get-rid-of-blk_integrity_revalidate.patch @@ -1,4 +1,4 @@ -From 19b7ccf8651df09d274671b53039c672a52ad84d Mon Sep 17 00:00:00 2001 +From 559040a100a7e9268103ff8ed739d74dc44e768a Mon Sep 17 00:00:00 2001 From: Ilya Dryomov <idryomov@gmail.com> Date: Tue, 18 Apr 2017 18:43:20 +0200 Subject: [PATCH] block: get rid of blk_integrity_revalidate() @@ -41,7 +41,7 @@ Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Signed-off-by: Jens Axboe <axboe@fb.com> diff --git a/block/blk-integrity.c b/block/blk-integrity.c -index b3622cb00fc2..ce43a8214d3e 100644 +index d69c5c79f98e..319f2e4f4a8b 100644 --- a/block/blk-integrity.c +++ b/block/blk-integrity.c @@ -417,7 +417,7 @@ void blk_integrity_register(struct gendisk *disk, struct blk_integrity *template @@ -49,7 +49,7 @@ index b3622cb00fc2..ce43a8214d3e 100644 bi->tag_size = template->tag_size; - blk_integrity_revalidate(disk); -+ disk->queue->backing_dev_info->capabilities |= BDI_CAP_STABLE_WRITES; ++ disk->queue->backing_dev_info.capabilities |= BDI_CAP_STABLE_WRITES; } EXPORT_SYMBOL(blk_integrity_register); @@ -58,7 +58,7 @@ index b3622cb00fc2..ce43a8214d3e 100644 void blk_integrity_unregister(struct gendisk *disk) { - blk_integrity_revalidate(disk); -+ disk->queue->backing_dev_info->capabilities &= ~BDI_CAP_STABLE_WRITES; ++ disk->queue->backing_dev_info.capabilities &= ~BDI_CAP_STABLE_WRITES; memset(&disk->queue->integrity, 0, sizeof(struct blk_integrity)); } EXPORT_SYMBOL(blk_integrity_unregister); @@ -71,10 +71,10 @@ index b3622cb00fc2..ce43a8214d3e 100644 - return; - - if (bi->profile) -- disk->queue->backing_dev_info->capabilities |= +- disk->queue->backing_dev_info.capabilities |= - BDI_CAP_STABLE_WRITES; - else -- disk->queue->backing_dev_info->capabilities &= +- disk->queue->backing_dev_info.capabilities &= - ~BDI_CAP_STABLE_WRITES; -} - @@ -82,10 +82,10 @@ index b3622cb00fc2..ce43a8214d3e 100644 { if (kobject_init_and_add(&disk->integrity_kobj, &integrity_ktype, diff --git a/block/partition-generic.c b/block/partition-generic.c -index 7afb9907821f..0171a2faad68 100644 +index 71d9ed9df8da..a2437c006640 100644 --- a/block/partition-generic.c +++ b/block/partition-generic.c -@@ -497,7 +497,6 @@ rescan: +@@ -447,7 +447,6 @@ rescan: if (disk->fops->revalidate_disk) disk->fops->revalidate_disk(disk); @@ -94,10 +94,10 @@ index 7afb9907821f..0171a2faad68 100644 bdev->bd_invalidated = 0; if (!get_capacity(disk) || !(state = check_partition(disk, bdev))) diff --git a/fs/block_dev.c b/fs/block_dev.c -index e405d8e58e31..9ccabe3bb7de 100644 +index 496d99b80fb0..585ff2c70d16 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c -@@ -1453,7 +1453,6 @@ int revalidate_disk(struct gendisk *disk) +@@ -1170,7 +1170,6 @@ int revalidate_disk(struct gendisk *disk) if (disk->fops->revalidate_disk) ret = disk->fops->revalidate_disk(disk); @@ -106,10 +106,10 @@ index e405d8e58e31..9ccabe3bb7de 100644 if (!bdev) return ret; diff --git a/include/linux/genhd.h b/include/linux/genhd.h -index 9e11082c7f9b..acff9437e5c3 100644 +index 1dbf52f9c24b..9e8cfdb5d976 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h -@@ -722,11 +722,9 @@ static inline void part_nr_sects_write(struct hd_struct *part, sector_t size) +@@ -731,11 +731,9 @@ static inline void part_nr_sects_write(struct hd_struct *part, sector_t size) #if defined(CONFIG_BLK_DEV_INTEGRITY) extern void blk_integrity_add(struct gendisk *); extern void blk_integrity_del(struct gendisk *); |