diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-10-28 13:17:01 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-28 13:17:20 +0100 |
| commit | e4340bbb07dd38339c0773543dd928886e512a57 (patch) | |
| tree | f38d9d2f929037325362328415b2a1e7bfe52a15 /fs/btrfs/ioctl.c | |
| parent | c13dc31adb04c3f85d54d2fa13e34206f25742eb (diff) | |
| parent | a22c4d7e34402ccdf3414f64c50365436eba7b93 (diff) | |
| download | op-kernel-dev-e4340bbb07dd38339c0773543dd928886e512a57.zip op-kernel-dev-e4340bbb07dd38339c0773543dd928886e512a57.tar.gz | |
Merge branch 'linus' into core/rcu, to fix up a semantic conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 3e3e613..8d20f3b 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: |
