summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipe David Borba Manana <fdmanana@gmail.com>2013-11-27 20:06:16 +0400
committerChris Mason <clm@fb.com>2014-01-29 01:19:49 +0400
commit878f2d2cb355da2dabbffb2ae51b7541a91ce4e3 (patch)
treeef1594fbaf8e1f750f1603598a218eb7c16ee5cf
parent12cfbad90e02793b7a71b7591ebd5c3f9228dc5d (diff)
downloadlinux-878f2d2cb355da2dabbffb2ae51b7541a91ce4e3.tar.xz
Btrfs: fix max dir item size calculation
We were accounting for sizeof(struct btrfs_item) twice, once in the data_size variable and another time in the if statement below. Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com> Signed-off-by: Josef Bacik <jbacik@fb.com> Signed-off-by: Chris Mason <clm@fb.com>
-rw-r--r--fs/btrfs/dir-item.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c
index c031ea3fd70f..9a89ceb25e83 100644
--- a/fs/btrfs/dir-item.c
+++ b/fs/btrfs/dir-item.c
@@ -261,7 +261,7 @@ int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,
* see if there is room in the item to insert this
* name
*/
- data_size = sizeof(*di) + name_len + sizeof(struct btrfs_item);
+ data_size = sizeof(*di) + name_len;
leaf = path->nodes[0];
slot = path->slots[0];
if (data_size + btrfs_item_size_nr(leaf, slot) +