diff options
| author | Chris Mason <clm@fb.com> | 2016-01-11 15:08:37 +0100 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-01-11 15:08:37 +0100 |
| commit | b28cf57246d5b797ba725bb033110c247f2c301f (patch) | |
| tree | 33dbe2cfcafa6e7f5b3047a669e454739839f3c7 /fs/btrfs/extent_io.c | |
| parent | Merge branch 'misc-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | btrfs: use list_for_each_entry* in backref.c (diff) | |
| download | linux-b28cf57246d5b797ba725bb033110c247f2c301f.tar.xz linux-b28cf57246d5b797ba725bb033110c247f2c301f.zip | |
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/extent_io.c')
| -rw-r--r-- | fs/btrfs/extent_io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index a2356e261531..2e7c97a3f344 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -4292,7 +4292,7 @@ int try_release_extent_mapping(struct extent_map_tree *map, u64 end = start + PAGE_CACHE_SIZE - 1; if (gfpflags_allow_blocking(mask) && - page->mapping->host->i_size > 16 * 1024 * 1024) { + page->mapping->host->i_size > SZ_16M) { u64 len; while (start <= end) { len = end - start + 1; |