Commit 32ab3d1b authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by David Sterba

btrfs: remove pointless indentation in btrfs_read_sys_array()

Instead of checking if we've read a BTRFS_CHUNK_ITEM_KEY from disk and
then process it we could just bail out early if the read disk key wasn't
a BTRFS_CHUNK_ITEM_KEY.

This removes a level of indentation and makes the code nicer to read.
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 5ae21692
...@@ -6806,11 +6806,18 @@ int btrfs_read_sys_array(struct btrfs_fs_info *fs_info) ...@@ -6806,11 +6806,18 @@ int btrfs_read_sys_array(struct btrfs_fs_info *fs_info)
sb_array_offset += len; sb_array_offset += len;
cur_offset += len; cur_offset += len;
if (key.type == BTRFS_CHUNK_ITEM_KEY) { if (key.type != BTRFS_CHUNK_ITEM_KEY) {
btrfs_err(fs_info,
"unexpected item type %u in sys_array at offset %u",
(u32)key.type, cur_offset);
ret = -EIO;
break;
}
chunk = (struct btrfs_chunk *)sb_array_offset; chunk = (struct btrfs_chunk *)sb_array_offset;
/* /*
* At least one btrfs_chunk with one stripe must be * At least one btrfs_chunk with one stripe must be present,
* present, exact stripe count check comes afterwards * exact stripe count check comes afterwards
*/ */
len = btrfs_chunk_item_size(1); len = btrfs_chunk_item_size(1);
if (cur_offset + len > array_size) if (cur_offset + len > array_size)
...@@ -6841,13 +6848,7 @@ int btrfs_read_sys_array(struct btrfs_fs_info *fs_info) ...@@ -6841,13 +6848,7 @@ int btrfs_read_sys_array(struct btrfs_fs_info *fs_info)
ret = read_one_chunk(&key, sb, chunk); ret = read_one_chunk(&key, sb, chunk);
if (ret) if (ret)
break; break;
} else {
btrfs_err(fs_info,
"unexpected item type %u in sys_array at offset %u",
(u32)key.type, cur_offset);
ret = -EIO;
break;
}
array_ptr += len; array_ptr += len;
sb_array_offset += len; sb_array_offset += len;
cur_offset += len; cur_offset += len;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment