Skip to content

Commit 79b3daf

Browse files
committed
btrfs: rename error to ret in device_list_add()
Unify naming of return value to the preferred way. Reviewed-by: Daniel Vacek <neelx@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent d740fb3 commit 79b3daf

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

fs/btrfs/volumes.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ static noinline struct btrfs_device *device_list_add(const char *path,
787787
u64 found_transid = btrfs_super_generation(disk_super);
788788
u64 devid = btrfs_stack_device_id(&disk_super->dev_item);
789789
dev_t path_devt;
790-
int error;
790+
int ret;
791791
bool same_fsid_diff_dev = false;
792792
bool has_metadata_uuid = (btrfs_super_incompat_flags(disk_super) &
793793
BTRFS_FEATURE_INCOMPAT_METADATA_UUID);
@@ -799,11 +799,11 @@ static noinline struct btrfs_device *device_list_add(const char *path,
799799
return ERR_PTR(-EAGAIN);
800800
}
801801

802-
error = lookup_bdev(path, &path_devt);
803-
if (error) {
802+
ret = lookup_bdev(path, &path_devt);
803+
if (ret) {
804804
btrfs_err(NULL, "failed to lookup block device for path %s: %d",
805-
path, error);
806-
return ERR_PTR(error);
805+
path, ret);
806+
return ERR_PTR(ret);
807807
}
808808

809809
fs_devices = find_fsid_by_device(disk_super, path_devt, &same_fsid_diff_dev);

0 commit comments

Comments
 (0)