diff options
| author | Chris Mason <clm@fb.com> | 2015-01-22 04:45:25 +0300 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-01-22 04:45:25 +0300 |
| commit | d3541834884f042aaaab1d6c0610cdc3488028e4 (patch) | |
| tree | d6f8f0ac6c98b1f996dfcaae5df0ba33a6fa5251 /fs/btrfs/scrub.c | |
| parent | ce93ec548cfa02f9cd6b70d546d5f36f4d160f57 (diff) | |
| parent | 1d4c08e0a60be356134d0c466744d0d4e16ebab0 (diff) | |
| download | linux-d3541834884f042aaaab1d6c0610cdc3488028e4.tar.xz | |
Merge branch 'fix/find-item-path-leak' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus
Diffstat (limited to 'fs/btrfs/scrub.c')
| -rw-r--r-- | fs/btrfs/scrub.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index 9e1569ffbf6e..53575a45f7d1 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -520,6 +520,7 @@ static int scrub_print_warning_inode(u64 inum, u64 offset, u64 root, struct inode_fs_paths *ipath = NULL; struct btrfs_root *local_root; struct btrfs_key root_key; + struct btrfs_key key; root_key.objectid = root; root_key.type = BTRFS_ROOT_ITEM_KEY; @@ -530,7 +531,14 @@ static int scrub_print_warning_inode(u64 inum, u64 offset, u64 root, goto err; } - ret = inode_item_info(inum, 0, local_root, swarn->path); + /* + * this makes the path point to (inum INODE_ITEM ioff) + */ + key.objectid = inum; + key.type = BTRFS_INODE_ITEM_KEY; + key.offset = 0; + + ret = btrfs_search_slot(NULL, local_root, &key, swarn->path, 0, 0); if (ret) { btrfs_release_path(swarn->path); goto err; |