diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-05-23 12:30:52 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-05-23 12:30:52 +0200 |
| commit | 712673339a0d085358fd1cd3a6477cc7979bb69f (patch) | |
| tree | b2e268685e3cbba19a4adb2a47d853e4e461fcfc /fs/btrfs/inode.c | |
| parent | Merge branch 'allocator' of git://git.kernel.org/pub/scm/linux/kernel/git/arn... (diff) | |
| parent | btrfs: add readonly flag (diff) | |
| download | linux-712673339a0d085358fd1cd3a6477cc7979bb69f.tar.xz linux-712673339a0d085358fd1cd3a6477cc7979bb69f.zip | |
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/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 8ae72c3eedb1..4d8ef95abf40 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1019,7 +1019,7 @@ static noinline int csum_exist_in_range(struct btrfs_root *root, LIST_HEAD(list); ret = btrfs_lookup_csums_range(root->fs_info->csum_root, bytenr, - bytenr + num_bytes - 1, &list); + bytenr + num_bytes - 1, &list, 0); if (ret == 0 && list_empty(&list)) return 0; |