btrfs: use q which is already obtained from bdev_get_queue

We have already assigned q from bdev_get_queue() so use it.
And rearrange the code for better view.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 2a4eada257436dd65d59fa2a97ea96bd0b5ba60b..6cad3233181c495fe7af0644cc42c94506ed62a7 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1013,14 +1013,13 @@ static int __btrfs_open_devices(struct btrfs_fs_devices *fs_devices,
                q = bdev_get_queue(bdev);
                if (blk_queue_discard(q))
                        device->can_discard = 1;
+               if (!blk_queue_nonrot(q))
+                       fs_devices->rotating = 1;
 
                device->bdev = bdev;
                device->in_fs_metadata = 0;
                device->mode = flags;
 
-               if (!blk_queue_nonrot(bdev_get_queue(bdev)))
-                       fs_devices->rotating = 1;
-
                fs_devices->open_devices++;
                if (device->writeable &&
                    device->devid != BTRFS_DEV_REPLACE_DEVID) {
@@ -2422,7 +2421,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path
        fs_info->free_chunk_space += device->total_bytes;
        spin_unlock(&fs_info->free_chunk_lock);
 
-       if (!blk_queue_nonrot(bdev_get_queue(bdev)))
+       if (!blk_queue_nonrot(q))
                fs_info->fs_devices->rotating = 1;
 
        tmp = btrfs_super_total_bytes(fs_info->super_copy);