diff options
| author | David Sterba <dsterba@suse.com> | 2016-05-16 15:46:23 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-05-16 15:46:23 +0200 |
| commit | 73d32ce21e1701eaafcea3cbc2a8f27ab1967abe (patch) | |
| tree | 136c03e4be575e4466ef9df119b8debdf768a56a /fs/btrfs/extent-tree.c | |
| parent | 02da2d72174c61988eb4456b53f405e3ebdebce4 (diff) | |
| parent | 4673272f43ae790ab9ec04e38a7542f82bb8f020 (diff) | |
Merge branch 'misc-4.7' into for-chris-4.7-20160516
Diffstat (limited to 'fs/btrfs/extent-tree.c')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 84e060eb0de8..391f576789e9 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -4620,7 +4620,7 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig, /* Calc the number of the pages we need flush for space reservation */ items = calc_reclaim_items_nr(root, to_reclaim); - to_reclaim = items * EXTENT_SIZE_PER_ITEM; + to_reclaim = (u64)items * EXTENT_SIZE_PER_ITEM; trans = (struct btrfs_trans_handle *)current->journal_info; block_rsv = &root->fs_info->delalloc_block_rsv; |