summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ctree.c
diff options
context:
space:
mode:
authorChris Mason <clm@fb.com>2016-01-11 06:08:37 -0800
committerChris Mason <clm@fb.com>2016-01-11 06:08:37 -0800
commitb28cf57246d5b797ba725bb033110c247f2c301f (patch)
tree33dbe2cfcafa6e7f5b3047a669e454739839f3c7 /fs/btrfs/ctree.c
parenta3058101c17d2825f34a0ab5c37d93ead0f4d9dc (diff)
parenta7ca42256d9fad572fb7f2c471514d7d3572b1db (diff)
downloadlinux-b28cf57246d5b797ba725bb033110c247f2c301f.tar.bz2
Merge branch 'misc-cleanups-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.5
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/ctree.c')
-rw-r--r--fs/btrfs/ctree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index be1be0422ff4..769e0ff1b4ce 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -1555,7 +1555,7 @@ noinline int btrfs_cow_block(struct btrfs_trans_handle *trans,
return 0;
}
- search_start = buf->start & ~((u64)(1024 * 1024 * 1024) - 1);
+ search_start = buf->start & ~((u64)SZ_1G - 1);
if (parent)
btrfs_set_lock_blocking(parent);