diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-28 15:26:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-28 15:26:59 -0400 |
commit | 0a2a1330d2621c7f963d9f55bb094811cc1c06b9 (patch) | |
tree | ee1850a7461623a9ac0fbcb2d8ccd1701606a5c6 /fs/btrfs/tree-log.c | |
parent | 9583f1c99fe5a11b3f294ac8093e93f008bea29e (diff) | |
parent | 0e4324a4c36b3eb5cd1f71cbbc38d888f919ebfc (diff) |
Merge branch 'for-4.13-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
"Fixes addressing problems reported by users, and there's one more
regression fix"
* 'for-4.13-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: round down size diff when shrinking/growing device
Btrfs: fix early ENOSPC due to delalloc
btrfs: fix lockup in find_free_extent with read-only block groups
Btrfs: fix dir item validation when replaying xattr deletes
Diffstat (limited to 'fs/btrfs/tree-log.c')
-rw-r--r-- | fs/btrfs/tree-log.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index f20ef211a73d..3a11ae63676e 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
@@ -2153,8 +2153,7 @@ process_leaf: | |||
2153 | u32 this_len = sizeof(*di) + name_len + data_len; | 2153 | u32 this_len = sizeof(*di) + name_len + data_len; |
2154 | char *name; | 2154 | char *name; |
2155 | 2155 | ||
2156 | ret = verify_dir_item(fs_info, path->nodes[0], | 2156 | ret = verify_dir_item(fs_info, path->nodes[0], i, di); |
2157 | path->slots[0], di); | ||
2158 | if (ret) { | 2157 | if (ret) { |
2159 | ret = -EIO; | 2158 | ret = -EIO; |
2160 | goto out; | 2159 | goto out; |