summaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2014-08-22 21:10:59 +0200
committerJ. Bruce Fields <bfields@redhat.com>2014-10-23 20:05:11 +0200
commitb0d2e42cce8fbf12998a24abf62a26c895dd2fd2 (patch)
tree1bbae5a6e95f415e2403aa996dec38c838ffcc39 /fs/nfsd
parentrpc: change comments to assertions (diff)
downloadlinux-b0d2e42cce8fbf12998a24abf62a26c895dd2fd2.tar.xz
linux-b0d2e42cce8fbf12998a24abf62a26c895dd2fd2.zip
NFSD: Always initialize cl_cb_addr
A client may not want to use the back channel on a transport it sent CREATE_SESSION on, in which case it clears SESSION4_BACK_CHAN. However, cl_cb_addr should be populated anyway, to be used if the client binds other connections to this session. If cl_cb_addr is not initialized, rpc_create() fails when the server attempts to set up a back channel on such secondary transports. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs4state.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index e9c3afe4b5d3..1afd7d4420bd 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1440,7 +1440,7 @@ static void init_session(struct svc_rqst *rqstp, struct nfsd4_session *new, stru
list_add(&new->se_perclnt, &clp->cl_sessions);
spin_unlock(&clp->cl_lock);
- if (cses->flags & SESSION4_BACK_CHAN) {
+ {
struct sockaddr *sa = svc_addr(rqstp);
/*
* This is a little silly; with sessions there's no real