]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
btrfs: rename error to ret in device_list_add()
authorDavid Sterba <dsterba@suse.com>
Wed, 18 Jun 2025 11:29:31 +0000 (13:29 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 21 Jul 2025 21:58:03 +0000 (23:58 +0200)
Unify naming of return value to the preferred way.

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

index ba344c673592ca63428abd5e0fafdaef9e98aab5..29282f26336e2d6929812925a662d36c7eb5d0ba 100644 (file)
@@ -787,7 +787,7 @@ static noinline struct btrfs_device *device_list_add(const char *path,
        u64 found_transid = btrfs_super_generation(disk_super);
        u64 devid = btrfs_stack_device_id(&disk_super->dev_item);
        dev_t path_devt;
-       int error;
+       int ret;
        bool same_fsid_diff_dev = false;
        bool has_metadata_uuid = (btrfs_super_incompat_flags(disk_super) &
                BTRFS_FEATURE_INCOMPAT_METADATA_UUID);
@@ -799,11 +799,11 @@ static noinline struct btrfs_device *device_list_add(const char *path,
                return ERR_PTR(-EAGAIN);
        }
 
-       error = lookup_bdev(path, &path_devt);
-       if (error) {
+       ret = lookup_bdev(path, &path_devt);
+       if (ret) {
                btrfs_err(NULL, "failed to lookup block device for path %s: %d",
-                         path, error);
-               return ERR_PTR(error);
+                         path, ret);
+               return ERR_PTR(ret);
        }
 
        fs_devices = find_fsid_by_device(disk_super, path_devt, &same_fsid_diff_dev);