diff options
| author | Jan Schmidt | 2012-03-23 17:32:28 +0100 |
|---|---|---|
| committer | Jan Schmidt | 2012-03-27 14:51:21 +0200 |
| commit | 7a3ae2f8c8c8432e65467b7fc84d5deab04061a0 (patch) | |
| tree | e93c46eb8def633533fe80032872f71b36fc03b8 /fs/btrfs/scrub.c | |
| parent | Btrfs: check return value of btrfs_cow_block() (diff) | |
| download | kernel-qcow2-linux-7a3ae2f8c8c8432e65467b7fc84d5deab04061a0.tar.gz kernel-qcow2-linux-7a3ae2f8c8c8432e65467b7fc84d5deab04061a0.tar.xz kernel-qcow2-linux-7a3ae2f8c8c8432e65467b7fc84d5deab04061a0.zip | |
Btrfs: fix regression in scrub path resolving
In commit 4692cf58 we introduced new backref walking code for btrfs. This
assumes we're searching live roots, which requires a transaction context.
While scrubbing, however, we must not join a transaction because this could
deadlock with the commit path. Additionally, what scrub really wants to do
is resolving a logical address in the commit root it's currently checking.
This patch adds support for logical to path resolving on commit roots and
makes scrub use that.
Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net>
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 abc0fbffa510..b9b84cdfc359 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -352,8 +352,8 @@ static void scrub_print_warning(const char *errstr, struct scrub_bio *sbio, } 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); } |