OSDN Git Service

btrfs: simplify btrfs_close_bdev
authorDavid Sterba <dsterba@suse.com>
Mon, 19 Jun 2017 14:55:35 +0000 (16:55 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 22 Jan 2018 15:08:12 +0000 (16:08 +0100)
Split the conditions a bit.

Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/volumes.c

index 372f515..96c6c0f 100644 (file)
@@ -903,13 +903,15 @@ static void free_device_rcu(struct rcu_head *head)
 
 static void btrfs_close_bdev(struct btrfs_device *device)
 {
-       if (device->bdev && device->writeable) {
+       if (!device->bdev)
+               return;
+
+       if (device->writeable) {
                sync_blockdev(device->bdev);
                invalidate_bdev(device->bdev);
        }
 
-       if (device->bdev)
-               blkdev_put(device->bdev, device->mode);
+       blkdev_put(device->bdev, device->mode);
 }
 
 static void btrfs_prepare_close_one_device(struct btrfs_device *device)