diff options
author | Chris Mason <chris.mason@oracle.com> | 2012-03-28 20:33:40 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2012-03-28 20:33:40 -0400 |
commit | 98961a7e431735c791dbaaf0337029e219a5db5a (patch) | |
tree | e045f062c01075e1f88ab758717cbfd7a7ddd4ca /fs/btrfs/scrub.c | |
parent | 1c691b330a19a1344df89bcb0f4cacd99e8b289a (diff) | |
parent | 7a3ae2f8c8c8432e65467b7fc84d5deab04061a0 (diff) |
Merge git://git.jan-o-sch.net/btrfs-unstable into for-linus
Conflicts:
fs/btrfs/transaction.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/scrub.c')
-rw-r--r-- | fs/btrfs/scrub.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index 07e59d97551..c9a2c1aef4b 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -400,8 +400,8 @@ static void scrub_print_warning(const char *errstr, struct scrub_block *sblock) } while (ret != 1); } else { swarn.path = path; - iterate_extent_inodes(fs_info, path, found_key.objectid, - extent_item_pos, + iterate_extent_inodes(fs_info, found_key.objectid, + extent_item_pos, 1, scrub_print_warning_inode, &swarn); } |