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/ioctl.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/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 05446f77f99b..013c6371e3e8 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -3067,8 +3067,8 @@ static long btrfs_ioctl_logical_to_ino(struct btrfs_root *root, goto out; extent_item_pos = loi->logical - key.objectid; - ret = iterate_extent_inodes(root->fs_info, path, key.objectid, - extent_item_pos, build_ino_list, + ret = iterate_extent_inodes(root->fs_info, key.objectid, + extent_item_pos, 0, build_ino_list, inodes); if (ret < 0) |