Skip to content

Commit d740fb3

Browse files
committed
btrfs: rename error to ret in btrfs_sysfs_add_mounted()
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 11015dc commit d740fb3

File tree

1 file changed

+23
-24
lines changed

1 file changed

+23
-24
lines changed

fs/btrfs/sysfs.c

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2324,71 +2324,70 @@ int btrfs_sysfs_add_fsid(struct btrfs_fs_devices *fs_devs)
23242324

23252325
int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info)
23262326
{
2327-
int error;
2327+
int ret;
23282328
struct btrfs_fs_devices *fs_devs = fs_info->fs_devices;
23292329
struct kobject *fsid_kobj = &fs_devs->fsid_kobj;
23302330

2331-
error = btrfs_sysfs_add_fs_devices(fs_devs);
2332-
if (error)
2333-
return error;
2331+
ret = btrfs_sysfs_add_fs_devices(fs_devs);
2332+
if (ret)
2333+
return ret;
23342334

2335-
error = sysfs_create_files(fsid_kobj, btrfs_attrs);
2336-
if (error) {
2335+
ret = sysfs_create_files(fsid_kobj, btrfs_attrs);
2336+
if (ret) {
23372337
btrfs_sysfs_remove_fs_devices(fs_devs);
2338-
return error;
2338+
return ret;
23392339
}
23402340

2341-
error = sysfs_create_group(fsid_kobj,
2342-
&btrfs_feature_attr_group);
2343-
if (error)
2341+
ret = sysfs_create_group(fsid_kobj, &btrfs_feature_attr_group);
2342+
if (ret)
23442343
goto failure;
23452344

23462345
#ifdef CONFIG_BTRFS_DEBUG
23472346
fs_info->debug_kobj = kobject_create_and_add("debug", fsid_kobj);
23482347
if (!fs_info->debug_kobj) {
2349-
error = -ENOMEM;
2348+
ret = -ENOMEM;
23502349
goto failure;
23512350
}
23522351

2353-
error = sysfs_create_files(fs_info->debug_kobj, btrfs_debug_mount_attrs);
2354-
if (error)
2352+
ret = sysfs_create_files(fs_info->debug_kobj, btrfs_debug_mount_attrs);
2353+
if (ret)
23552354
goto failure;
23562355
#endif
23572356

23582357
/* Discard directory */
23592358
fs_info->discard_kobj = kobject_create_and_add("discard", fsid_kobj);
23602359
if (!fs_info->discard_kobj) {
2361-
error = -ENOMEM;
2360+
ret = -ENOMEM;
23622361
goto failure;
23632362
}
23642363

2365-
error = sysfs_create_files(fs_info->discard_kobj, discard_attrs);
2366-
if (error)
2364+
ret = sysfs_create_files(fs_info->discard_kobj, discard_attrs);
2365+
if (ret)
23672366
goto failure;
23682367

2369-
error = addrm_unknown_feature_attrs(fs_info, true);
2370-
if (error)
2368+
ret = addrm_unknown_feature_attrs(fs_info, true);
2369+
if (ret)
23712370
goto failure;
23722371

2373-
error = sysfs_create_link(fsid_kobj, &fs_info->sb->s_bdi->dev->kobj, "bdi");
2374-
if (error)
2372+
ret = sysfs_create_link(fsid_kobj, &fs_info->sb->s_bdi->dev->kobj, "bdi");
2373+
if (ret)
23752374
goto failure;
23762375

23772376
fs_info->space_info_kobj = kobject_create_and_add("allocation",
23782377
fsid_kobj);
23792378
if (!fs_info->space_info_kobj) {
2380-
error = -ENOMEM;
2379+
ret = -ENOMEM;
23812380
goto failure;
23822381
}
23832382

2384-
error = sysfs_create_files(fs_info->space_info_kobj, allocation_attrs);
2385-
if (error)
2383+
ret = sysfs_create_files(fs_info->space_info_kobj, allocation_attrs);
2384+
if (ret)
23862385
goto failure;
23872386

23882387
return 0;
23892388
failure:
23902389
btrfs_sysfs_remove_mounted(fs_info);
2391-
return error;
2390+
return ret;
23922391
}
23932392

23942393
static ssize_t qgroup_enabled_show(struct kobject *qgroups_kobj,

0 commit comments

Comments
 (0)