diff options
| author | Chris Mason <clm@fb.com> | 2015-03-25 18:43:16 +0100 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-03-25 18:43:16 +0100 |
| commit | 9deed229fa8a83bb5cd713b2d2a8e5c022a4b45b (patch) | |
| tree | a98200a7176d8066099fde32e9691c7c36f66b1e /fs/btrfs/ioctl.c | |
| parent | Linux 4.0-rc5 (diff) | |
| parent | btrfs: remove shadowing variables in __btrfs_map_block (diff) | |
| download | linux-9deed229fa8a83bb5cd713b2d2a8e5c022a4b45b.tar.xz linux-9deed229fa8a83bb5cd713b2d2a8e5c022a4b45b.zip | |
Merge branch 'cleanups-for-4.1-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.1
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 74609b931ba5..94cde83eb3da 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -1564,7 +1564,7 @@ static noinline int btrfs_ioctl_resize(struct file *file, goto out_free; } - do_div(new_size, root->sectorsize); + new_size = div_u64(new_size, root->sectorsize); new_size *= root->sectorsize; printk_in_rcu(KERN_INFO "BTRFS: new size for %s is %llu\n", @@ -3039,7 +3039,7 @@ out: static int check_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root, u64 disko) { - struct seq_list tree_mod_seq_elem = {}; + struct seq_list tree_mod_seq_elem = SEQ_LIST_INIT(tree_mod_seq_elem); struct ulist *roots; struct ulist_iterator uiter; struct ulist_node *root_node = NULL; |