aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYueHaibing <yuehaibing@huawei.com>2019-02-20 07:32:02 -0500
committerDavid Sterba <dsterba@suse.com>2019-02-25 08:19:23 -0500
commitf65e25e343cfc0e6f4db9a687c4085fad268325d (patch)
tree6cc60e13debb16510fe5387ff6932a4e99dd7f81
parent253002f2e3f4e2bbb0cbdd9e9fe2f5b9ec88f694 (diff)
btrfs: Remove unnecessary casts in btrfs_read_root_item
There is a messy cast here: min_t(int, len, (int)sizeof(*item))); min_t() should normally cast to unsigned. It's not possible for "len" to be negative, but if it were then we definitely wouldn't want to pass negatives to read_extent_buffer(). Also there is an extra cast. This patch shouldn't affect runtime, it's just a clean up. Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Qu Wenruo <wqu@suse.com> Signed-off-by: YueHaibing <yuehaibing@huawei.com> Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--fs/btrfs/root-tree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index 65bda0682928..0d2b957ca3a3 100644
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -21,12 +21,12 @@ static void btrfs_read_root_item(struct extent_buffer *eb, int slot,
21 struct btrfs_root_item *item) 21 struct btrfs_root_item *item)
22{ 22{
23 uuid_le uuid; 23 uuid_le uuid;
24 int len; 24 u32 len;
25 int need_reset = 0; 25 int need_reset = 0;
26 26
27 len = btrfs_item_size_nr(eb, slot); 27 len = btrfs_item_size_nr(eb, slot);
28 read_extent_buffer(eb, item, btrfs_item_ptr_offset(eb, slot), 28 read_extent_buffer(eb, item, btrfs_item_ptr_offset(eb, slot),
29 min_t(int, len, (int)sizeof(*item))); 29 min_t(u32, len, sizeof(*item)));
30 if (len < sizeof(*item)) 30 if (len < sizeof(*item))
31 need_reset = 1; 31 need_reset = 1;
32 if (!need_reset && btrfs_root_generation(item) 32 if (!need_reset && btrfs_root_generation(item)