From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>, Jan Kara <jack@suse.cz>
Cc: linux-block@vger.kernel.org, linux-s390@vger.kernel.org
Subject: [PATCH 6/7] block: move clearing bd_invalidated into check_disk_size_change
Date: Thu, 14 Nov 2019 15:34:37 +0100 [thread overview]
Message-ID: <20191114143438.14681-7-hch@lst.de> (raw)
In-Reply-To: <20191114143438.14681-1-hch@lst.de>
Both callers of check_disk_size_change clear bd_invalidate directly
after the call, so move the clearing into check_disk_size_change
itself.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/block_dev.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 9558a2f064b1..ee63c2732fa2 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1433,6 +1433,7 @@ static void check_disk_size_change(struct gendisk *disk,
if (bdev_size > disk_size)
flush_disk(bdev, false);
}
+ bdev->bd_invalidated = 0;
}
/**
@@ -1462,7 +1463,6 @@ int revalidate_disk(struct gendisk *disk)
mutex_lock(&bdev->bd_mutex);
check_disk_size_change(disk, bdev, ret == 0);
- bdev->bd_invalidated = 0;
mutex_unlock(&bdev->bd_mutex);
bdput(bdev);
}
@@ -1526,7 +1526,6 @@ int bdev_disk_changed(struct block_device *bdev, bool invalidate)
disk->fops->revalidate_disk(disk);
check_disk_size_change(disk, bdev, !invalidate);
- bdev->bd_invalidated = 0;
if (get_capacity(disk)) {
ret = blk_add_partitions(disk, bdev);
--
2.20.1
next prev parent reply other threads:[~2019-11-14 14:34 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-14 14:34 disk revalidation cleanups and fixlets v2 Christoph Hellwig
2019-11-14 14:34 ` [PATCH 1/7] block: refactor rescan_partitions Christoph Hellwig
2019-11-14 14:34 ` [PATCH 2/7] block: merge invalidate_partitions into rescan_partitions Christoph Hellwig
2019-11-15 10:05 ` Hannes Reinecke
2019-11-30 21:49 ` Eric Biggers
2019-11-30 22:06 ` Eric Biggers
2019-12-02 7:21 ` Christoph Hellwig
2019-11-14 14:34 ` [PATCH 3/7] block: move rescan_partitions to fs/block_dev.c Christoph Hellwig
2019-11-15 10:06 ` Hannes Reinecke
2019-11-14 14:34 ` [PATCH 4/7] block: fix bdev_disk_changed for non-partitioned devices Christoph Hellwig
2019-11-15 10:07 ` Hannes Reinecke
2019-11-14 14:34 ` [PATCH 5/7] block: remove (__)blkdev_reread_part as an exported API Christoph Hellwig
2019-11-15 10:08 ` Hannes Reinecke
2019-11-14 14:34 ` Christoph Hellwig [this message]
2019-11-15 10:08 ` [PATCH 6/7] block: move clearing bd_invalidated into check_disk_size_change Hannes Reinecke
2019-11-14 14:34 ` [PATCH 7/7] block: move setting bd_invalidated from flush_disk to check_disk_change Christoph Hellwig
2019-11-15 10:09 ` Hannes Reinecke
2019-11-14 14:44 ` disk revalidation cleanups and fixlets v2 Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191114143438.14681-7-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=jack@suse.cz \
--cc=linux-block@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).