diff options
| author | Chris Mason <clm@fb.com> | 2016-01-11 06:08:37 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-01-11 06:08:37 -0800 |
| commit | b28cf57246d5b797ba725bb033110c247f2c301f (patch) | |
| tree | 33dbe2cfcafa6e7f5b3047a669e454739839f3c7 /fs/btrfs/disk-io.c | |
| parent | a3058101c17d2825f34a0ab5c37d93ead0f4d9dc (diff) | |
| parent | a7ca42256d9fad572fb7f2c471514d7d3572b1db (diff) | |
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/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index c94457fde64d..c67c129fe99a 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -2824,7 +2824,7 @@ int open_ctree(struct super_block *sb, fs_info->bdi.ra_pages *= btrfs_super_num_devices(disk_super); fs_info->bdi.ra_pages = max(fs_info->bdi.ra_pages, - 4 * 1024 * 1024 / PAGE_CACHE_SIZE); + SZ_4M / PAGE_CACHE_SIZE); tree_root->nodesize = nodesize; tree_root->sectorsize = sectorsize; @@ -3996,7 +3996,6 @@ static void __btrfs_btree_balance_dirty(struct btrfs_root *root, balance_dirty_pages_ratelimited( root->fs_info->btree_inode->i_mapping); } - return; } void btrfs_btree_balance_dirty(struct btrfs_root *root) |