[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 20/45] block: refactor __blkdev_put



Reorder the code to have one big section for the last close, and to use
bdev_is_partition.

Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Reviewed-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Reviewed-by: Jan Kara <jack@xxxxxxx>
---
 fs/block_dev.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 437f67e12b2838..88847839ef0102 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1738,22 +1738,22 @@ static void __blkdev_put(struct block_device *bdev, 
fmode_t mode, int for_part)
                WARN_ON_ONCE(bdev->bd_holders);
                sync_blockdev(bdev);
                kill_bdev(bdev);
-
                bdev_write_inode(bdev);
-       }
-       if (bdev->bd_contains == bdev) {
-               if (disk->fops->release)
+
+               if (!bdev_is_partition(bdev) && disk->fops->release)
                        disk->fops->release(disk, mode);
-       }
-       if (!bdev->bd_openers) {
+
                disk_put_part(bdev->bd_part);
                bdev->bd_part = NULL;
                bdev->bd_disk = NULL;
-               if (bdev != bdev->bd_contains)
+               if (bdev_is_partition(bdev))
                        victim = bdev->bd_contains;
                bdev->bd_contains = NULL;
 
                put_disk_and_module(disk);
+       } else {
+               if (!bdev_is_partition(bdev) && disk->fops->release)
+                       disk->fops->release(disk, mode);
        }
        mutex_unlock(&bdev->bd_mutex);
        bdput(bdev);
-- 
2.29.2




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.