summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/file-item.c
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2011-05-23 06:30:52 -0400
committerChris Mason <chris.mason@oracle.com>2011-05-23 06:30:52 -0400
commit712673339a0d085358fd1cd3a6477cc7979bb69f (patch)
treeb2e268685e3cbba19a4adb2a47d853e4e461fcfc /fs/btrfs/file-item.c
parentaa2dfb372a2a647beedac163ce6f8b0fcbefac29 (diff)
parent8628764e1a5e1998a42b9713e9edea7753653d01 (diff)
downloadop-kernel-dev-712673339a0d085358fd1cd3a6477cc7979bb69f.zip
op-kernel-dev-712673339a0d085358fd1cd3a6477cc7979bb69f.tar.gz
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/arne/btrfs-unstable-arne into inode_numbers
Conflicts: fs/btrfs/Makefile fs/btrfs/ctree.h fs/btrfs/volumes.h Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/file-item.c')
-rw-r--r--fs/btrfs/file-item.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index 29e0149..b437cc7 100644
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -267,7 +267,7 @@ int btrfs_lookup_bio_sums_dio(struct btrfs_root *root, struct inode *inode,
}
int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,
- struct list_head *list)
+ struct list_head *list, int search_commit)
{
struct btrfs_key key;
struct btrfs_path *path;
@@ -284,6 +284,12 @@ int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,
path = btrfs_alloc_path();
BUG_ON(!path);
+ if (search_commit) {
+ path->skip_locking = 1;
+ path->reada = 2;
+ path->search_commit_root = 1;
+ }
+
key.objectid = BTRFS_EXTENT_CSUM_OBJECTID;
key.offset = start;
key.type = BTRFS_EXTENT_CSUM_KEY;
OpenPOWER on IntegriCloud