[PATCH 4/4] btrfs: drop devid as device_list_add() arg

[Anand Jain]

As struct btrfs_disk_super is being passed, so it can get devid
the same way its parent does.

Signed-off-by: Anand Jain <anand.j...@oracle.com>
Reviewed-by: Josef Bacik <jba...@fb.com>
---
 fs/btrfs/volumes.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index d74d01971d0c..bd2e8616755e 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -731,12 +731,13 @@ static int btrfs_open_one_device(struct btrfs_fs_devices 
*fs_devices,
  * < 0 - error
  */
 static noinline struct btrfs_device *device_list_add(const char *path,
-                          struct btrfs_super_block *disk_super, u64 devid)
+                          struct btrfs_super_block *disk_super)
 {
        struct btrfs_device *device;
        struct btrfs_fs_devices *fs_devices;
        struct rcu_string *name;
        u64 found_transid = btrfs_super_generation(disk_super);
+       u64 devid = btrfs_stack_device_id(&disk_super->dev_item);
 
        fs_devices = find_fsid(disk_super->fsid);
        if (!fs_devices) {
@@ -1184,7 +1185,6 @@ int btrfs_scan_one_device(const char *path, fmode_t 
flags, void *holder,
        struct block_device *bdev;
        struct page *page;
        int ret = 0;
-       u64 devid;
        u64 bytenr;
 
        /*
@@ -1205,10 +1205,8 @@ int btrfs_scan_one_device(const char *path, fmode_t 
flags, void *holder,
                goto error_bdev_put;
        }
 
-       devid = btrfs_stack_device_id(&disk_super->dev_item);
-
        mutex_lock(&uuid_mutex);
-       device = device_list_add(path, disk_super, devid);
+       device = device_list_add(path, disk_super);
        mutex_unlock(&uuid_mutex);
        if (IS_ERR(device))
                ret = PTR_ERR(device);
-- 
2.7.0

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html