system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-20 02:57:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs: minor style cleanups in btrfs_scan_one_device

Browse source 
Assign ret = -EINVAL where it is actually required.
Remove { } around single line if else code.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Anand Jain 2017-12-15 15:40:16 +08:00 committed by David Sterba
parent c1f32b7c1f
commit 05a5c55dfc
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fs/btrfs/volumes.c
View file

@ -1186,7 +1186,7 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,
struct btrfs_super_block *disk_super; struct btrfs_super_block *disk_super;
struct block_device *bdev; struct block_device *bdev;
struct page *page; struct page *page;
int ret = -EINVAL; int ret;
u64 devid; u64 devid;
u64 transid; u64 transid;
u64 total_devices; u64 total_devices;
@ -1208,8 +1208,10 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,
goto error; goto error;
} }
if (btrfs_read_disk_super(bdev, bytenr, &page, &disk_super)) if (btrfs_read_disk_super(bdev, bytenr, &page, &disk_super)) {
ret = -EINVAL;
goto error_bdev_put; goto error_bdev_put;
}
devid = btrfs_stack_device_id(&disk_super->dev_item); devid = btrfs_stack_device_id(&disk_super->dev_item);
transid = btrfs_super_generation(disk_super); transid = btrfs_super_generation(disk_super);
@ -1217,11 +1219,10 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,
ret = device_list_add(path, disk_super, devid, fs_devices_ret); ret = device_list_add(path, disk_super, devid, fs_devices_ret);
if (ret > 0) { if (ret > 0) {
if (disk_super->label[0]) { if (disk_super->label[0])
pr_info("BTRFS: device label %s ", disk_super->label); pr_info("BTRFS: device label %s ", disk_super->label);
} else { else
pr_info("BTRFS: device fsid %pU ", disk_super->fsid); pr_info("BTRFS: device fsid %pU ", disk_super->fsid);
}
pr_cont("devid %llu transid %llu %s\n", devid, transid, path); pr_cont("devid %llu transid %llu %s\n", devid, transid, path);
ret = 0; ret = 0;