diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-25 14:29:44 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-25 14:29:44 (GMT) |
commit | 194c8581eb9b6d42e9232c7693d86d2ee3799986 (patch) | |
tree | 86d926b7407c33379dd719fad2ccaf03d5c5228a /net/sunrpc/svc_xprt.c | |
parent | c0ff9019ee64101fda8f19338da799fda8217e14 (diff) | |
parent | 33688abb2802ff3a230bd2441f765477b94cc89e (diff) | |
download | linux-194c8581eb9b6d42e9232c7693d86d2ee3799986.tar.xz |
Merge 4.7-rc4 into char-misc-next
We want those fixes in here to help with merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/sunrpc/svc_xprt.c')
-rw-r--r-- | net/sunrpc/svc_xprt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c index f5572e3..4f01f63 100644 --- a/net/sunrpc/svc_xprt.c +++ b/net/sunrpc/svc_xprt.c @@ -136,6 +136,8 @@ static void svc_xprt_free(struct kref *kref) /* See comment on corresponding get in xs_setup_bc_tcp(): */ if (xprt->xpt_bc_xprt) xprt_put(xprt->xpt_bc_xprt); + if (xprt->xpt_bc_xps) + xprt_switch_put(xprt->xpt_bc_xps); xprt->xpt_ops->xpo_free(xprt); module_put(owner); } |