diff options
author | Felipe Balbi <balbi@ti.com> | 2014-09-16 09:53:59 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2014-09-16 09:53:59 -0500 |
commit | 4cd41ffd27b6b775445ecfdb72b592b71d6b4a32 (patch) | |
tree | 61e8c51ed5b9fae163d2d54967ebda02805c0bfa /fs/lockd | |
parent | d9152161b4bfd131a8253a5b9fcd8ba9b10277c4 (diff) | |
parent | 9e82bf014195d6f0054982c463575cdce24292be (diff) |
Merge tag 'v3.17-rc5' into next
Linux 3.17-rc5
Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
Documentation/devicetree/bindings/usb/mxs-phy.txt
drivers/usb/phy/phy-mxs-usb.c
Diffstat (limited to 'fs/lockd')
-rw-r--r-- | fs/lockd/svc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index 8f27c93f8d2e..ec9e082f9ecd 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c @@ -253,13 +253,11 @@ static int lockd_up_net(struct svc_serv *serv, struct net *net) error = make_socks(serv, net); if (error < 0) - goto err_socks; + goto err_bind; set_grace_period(net); dprintk("lockd_up_net: per-net data created; net=%p\n", net); return 0; -err_socks: - svc_rpcb_cleanup(serv, net); err_bind: ln->nlmsvc_users--; return error; |