linux-scsi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>, Song Liu <song@kernel.org>
Cc: "Konrad Rzeszutek Wilk" <konrad.wilk@oracle.com>,
	"Roger Pau Monné" <roger.pau@citrix.com>,
	"Minchan Kim" <minchan@kernel.org>,
	"Nitin Gupta" <ngupta@vflare.org>,
	"Stefan Haberland" <sth@linux.ibm.com>,
	"Jan Hoeppner" <hoeppner@linux.ibm.com>,
	linux-block@vger.kernel.org, linux-raid@vger.kernel.org,
	linux-s390@vger.kernel.org, linux-scsi@vger.kernel.org,
	"Ming Lei" <ming.lei@redhat.com>
Subject: [PATCH 2/8] block: move sync_blockdev from __blkdev_put to blkdev_put
Date: Tue, 25 May 2021 08:12:55 +0200	[thread overview]
Message-ID: <20210525061301.2242282-3-hch@lst.de> (raw)
In-Reply-To: <20210525061301.2242282-1-hch@lst.de>

Do the early unlocked syncing even earlier to move more code out of
the recursive path.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
---
 fs/block_dev.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 2b5073e3c923..41d2d9708bf8 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1552,16 +1552,6 @@ static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part)
 	struct gendisk *disk = bdev->bd_disk;
 	struct block_device *victim = NULL;
 
-	/*
-	 * Sync early if it looks like we're the last one.  If someone else
-	 * opens the block device between now and the decrement of bd_openers
-	 * then we did a sync that we didn't need to, but that's not the end
-	 * of the world and we want to avoid long (could be several minute)
-	 * syncs while holding the mutex.
-	 */
-	if (bdev->bd_openers == 1)
-		sync_blockdev(bdev);
-
 	mutex_lock_nested(&bdev->bd_mutex, for_part);
 	if (for_part)
 		bdev->bd_part_count--;
@@ -1588,6 +1578,16 @@ void blkdev_put(struct block_device *bdev, fmode_t mode)
 {
 	struct gendisk *disk = bdev->bd_disk;
 
+	/*
+	 * Sync early if it looks like we're the last one.  If someone else
+	 * opens the block device between now and the decrement of bd_openers
+	 * then we did a sync that we didn't need to, but that's not the end
+	 * of the world and we want to avoid long (could be several minute)
+	 * syncs while holding the mutex.
+	 */
+	if (bdev->bd_openers == 1)
+		sync_blockdev(bdev);
+
 	mutex_lock(&bdev->bd_mutex);
 
 	if (mode & FMODE_EXCL) {
-- 
2.30.2


  parent reply	other threads:[~2021-05-25  6:13 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-25  6:12 move bd_mutex to the gendisk v2 Christoph Hellwig
2021-05-25  6:12 ` [PATCH 1/8] block: split __blkdev_get Christoph Hellwig
2021-05-25  8:04   ` Hannes Reinecke
2021-05-25  6:12 ` Christoph Hellwig [this message]
2021-05-25  8:05   ` [PATCH 2/8] block: move sync_blockdev from __blkdev_put to blkdev_put Hannes Reinecke
2021-05-25  6:12 ` [PATCH 3/8] block: move bd_mutex to struct gendisk Christoph Hellwig
2021-05-25  8:06   ` Hannes Reinecke
2021-05-26  1:06   ` Ming Lei
2021-05-28  7:27   ` Roger Pau Monné
2021-05-25  6:12 ` [PATCH 4/8] block: move adjusting bd_part_count out of __blkdev_get Christoph Hellwig
2021-05-25  8:18   ` Hannes Reinecke
2021-05-26  1:59   ` Ming Lei
2021-05-25  6:12 ` [PATCH 5/8] block: split __blkdev_put Christoph Hellwig
2021-05-25  8:19   ` Hannes Reinecke
2021-05-26  2:05   ` Ming Lei
2021-05-25  6:12 ` [PATCH 6/8] block: move bd_part_count to struct gendisk Christoph Hellwig
2021-05-25  8:20   ` Hannes Reinecke
2021-05-26  2:09   ` Ming Lei
2021-05-25  6:13 ` [PATCH 7/8] block: factor out a part_devt helper Christoph Hellwig
2021-05-25  8:25   ` Hannes Reinecke
2021-05-26  2:16   ` Ming Lei
2021-05-25  6:13 ` [PATCH 8/8] block: remove bdget_disk Christoph Hellwig
2021-05-25  8:26   ` Hannes Reinecke
2021-05-26  2:24   ` Ming Lei
2021-06-01 13:48 ` move bd_mutex to the gendisk v2 Jens Axboe
  -- strict thread matches above, loose matches on Subject: below --
2021-05-12  6:18 move bd_mutex to the gendisk (resend) Christoph Hellwig
2021-05-12  6:18 ` [PATCH 2/8] block: move sync_blockdev from __blkdev_put to blkdev_put Christoph Hellwig
2021-05-19  9:32   ` Ming Lei

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=20210525061301.2242282-3-hch@lst.de \
    --to=hch@lst.de \
    --cc=axboe@kernel.dk \
    --cc=hoeppner@linux.ibm.com \
    --cc=konrad.wilk@oracle.com \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-raid@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=minchan@kernel.org \
    --cc=ming.lei@redhat.com \
    --cc=ngupta@vflare.org \
    --cc=roger.pau@citrix.com \
    --cc=song@kernel.org \
    --cc=sth@linux.ibm.com \
    /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).