diff options
| author | Al Viro <viro@ZenIV.linux.org.uk> | 2017-12-06 02:29:09 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-06 02:39:29 +0300 |
| commit | 8e1611e2357927b22892ecc062d65c99d0d89066 (patch) | |
| tree | e96c21ce49a9bb3225e8334f87a64dcd14162a75 /drivers/staging | |
| parent | 016a266bdfeda268afb2228b6217fd4771334635 (diff) | |
| download | linux-8e1611e2357927b22892ecc062d65c99d0d89066.tar.xz | |
make sock_alloc_file() do sock_release() on failures
This changes calling conventions (and simplifies the hell out
the callers). New rules: once struct socket had been passed
to sock_alloc_file(), it's been consumed either by struct file
or by sock_release() done by sock_alloc_file(). Either way
the caller should not do sock_release() after that point.
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/lustre/lnet/lnet/lib-socket.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/lustre/lnet/lnet/lib-socket.c b/drivers/staging/lustre/lnet/lnet/lib-socket.c index 539a26444f31..7d49d4865298 100644 --- a/drivers/staging/lustre/lnet/lnet/lib-socket.c +++ b/drivers/staging/lustre/lnet/lnet/lib-socket.c @@ -71,16 +71,12 @@ lnet_sock_ioctl(int cmd, unsigned long arg) } sock_filp = sock_alloc_file(sock, 0, NULL); - if (IS_ERR(sock_filp)) { - sock_release(sock); - rc = PTR_ERR(sock_filp); - goto out; - } + if (IS_ERR(sock_filp)) + return PTR_ERR(sock_filp); rc = kernel_sock_unlocked_ioctl(sock_filp, cmd, arg); fput(sock_filp); -out: return rc; } |