diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-05-23 06:30:52 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-05-23 06:30:52 -0400 |
| commit | 712673339a0d085358fd1cd3a6477cc7979bb69f (patch) | |
| tree | b2e268685e3cbba19a4adb2a47d853e4e461fcfc /fs/btrfs/relocation.c | |
| parent | aa2dfb372a2a647beedac163ce6f8b0fcbefac29 (diff) | |
| parent | 8628764e1a5e1998a42b9713e9edea7753653d01 (diff) | |
| download | kernel_samsung_smdk4412-712673339a0d085358fd1cd3a6477cc7979bb69f.zip kernel_samsung_smdk4412-712673339a0d085358fd1cd3a6477cc7979bb69f.tar.gz kernel_samsung_smdk4412-712673339a0d085358fd1cd3a6477cc7979bb69f.tar.bz2 | |
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/relocation.c')
| -rw-r--r-- | fs/btrfs/relocation.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 051992c..fa2c5d8 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -4245,7 +4245,7 @@ int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len) disk_bytenr = file_pos + BTRFS_I(inode)->index_cnt; ret = btrfs_lookup_csums_range(root->fs_info->csum_root, disk_bytenr, - disk_bytenr + len - 1, &list); + disk_bytenr + len - 1, &list, 0); while (!list_empty(&list)) { sums = list_entry(list.next, struct btrfs_ordered_sum, list); |