diff options
author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-11-04 19:50:07 +0300 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-11-04 19:50:07 +0300 |
commit | f4845bd61300c2b5013bd4fa28c83975a85069bc (patch) | |
tree | 974925d5ec1d615a748d37dab2e41c823e38f5c5 /fs/btrfs/ioctl.c | |
parent | 3985b18650bf2365debb142624f877007b31ada2 (diff) | |
parent | a852cc89cffb65272be77785b9eb2682e38ed53f (diff) |
Merge branch 'tracking-ilp32' into merge-linux-linaro-extralinux-linaro-extra-20151104.0linux-linaro-extra
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r-- | fs/btrfs/ioctl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 3e3e6130637f..8d20f3b1cab0 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -4641,7 +4641,7 @@ locked: if (bctl->flags & ~(BTRFS_BALANCE_ARGS_MASK | BTRFS_BALANCE_TYPE_MASK)) { ret = -EINVAL; - goto out_bargs; + goto out_bctl; } do_balance: @@ -4655,12 +4655,15 @@ do_balance: need_unlock = false; ret = btrfs_balance(bctl, bargs); + bctl = NULL; if (arg) { if (copy_to_user(arg, bargs, sizeof(*bargs))) ret = -EFAULT; } +out_bctl: + kfree(bctl); out_bargs: kfree(bargs); out_unlock: |