diff options
author | Andy Adamson <andros@netapp.com> | 2011-01-05 21:04:31 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-01-06 14:46:24 -0500 |
commit | 2c2618c6f29c41a0a966f14f05c8bf45fcabb750 (patch) | |
tree | c247cfda9f847028e1d43cab1e69d2cd8a2146a4 /net/sunrpc/svcsock.c | |
parent | f4eecd5da3422e82e88e36c33cbd2595eebcacb1 (diff) |
NFS associate sessionid with callback connection
The sessions based callback service is started prior to the CREATE_SESSION call
so that it can handle CB_NULL requests which can be sent before the
CREATE_SESSION call returns and the session ID is known.
Set the callback sessionid after a sucessful CREATE_SESSION.
Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc/svcsock.c')
-rw-r--r-- | net/sunrpc/svcsock.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index e6b66d81115e..db3013e4aa04 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c | |||
@@ -1605,7 +1605,9 @@ static struct svc_xprt *svc_bc_create_socket(struct svc_serv *serv, | |||
1605 | */ | 1605 | */ |
1606 | static void svc_bc_sock_free(struct svc_xprt *xprt) | 1606 | static void svc_bc_sock_free(struct svc_xprt *xprt) |
1607 | { | 1607 | { |
1608 | if (xprt) | 1608 | if (xprt) { |
1609 | kfree(xprt->xpt_bc_sid); | ||
1609 | kfree(container_of(xprt, struct svc_sock, sk_xprt)); | 1610 | kfree(container_of(xprt, struct svc_sock, sk_xprt)); |
1611 | } | ||
1610 | } | 1612 | } |
1611 | #endif /* CONFIG_NFS_V4_1 */ | 1613 | #endif /* CONFIG_NFS_V4_1 */ |