This patch adds the BIND_CONN_TO_SESSION operation which is needed for
upcoming SP4_MACH_CRED work and useful for recovering from broken connections
without destroying the session.
Signed-off-by: Weston Andros Adamson <[email protected]>
---
fs/nfs/nfs4_fs.h | 1 +
fs/nfs/nfs4proc.c | 54 ++++++++++++++++++++++++++++
fs/nfs/nfs4xdr.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++
include/linux/nfs4.h | 5 +++
include/linux/nfs_xdr.h | 6 +++
5 files changed, 156 insertions(+), 0 deletions(-)
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index edeef71..ad90bc7 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -215,6 +215,7 @@ struct vfsmount *nfs4_submount(struct nfs_server *, struct dentry *,
extern int nfs4_proc_setclientid(struct nfs_client *, u32, unsigned short, struct rpc_cred *, struct nfs4_setclientid_res *);
extern int nfs4_proc_setclientid_confirm(struct nfs_client *, struct nfs4_setclientid_res *arg, struct rpc_cred *);
extern int nfs4_proc_get_rootfh(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *);
+extern int nfs4_proc_bind_conn_to_session(struct nfs_client *);
extern int nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred);
extern int nfs4_init_clientid(struct nfs_client *, struct rpc_cred *);
extern int nfs41_init_clientid(struct nfs_client *, struct rpc_cred *);
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 78784e5..7a4b320 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -5062,6 +5062,60 @@ nfs41_same_server_scope(struct server_scope *a, struct server_scope *b)
}
/*
+ * nfs4_proc_bind_conn_to_session()
+ *
+ * The 4.1 client currently uses the same TCP connection for the
+ * fore and backchannel.
+ */
+int nfs4_proc_bind_conn_to_session(struct nfs_client *clp)
+{
+ int status;
+ struct nfs41_bind_conn_to_session_res res;
+ struct rpc_message msg = {
+ .rpc_proc =
+ &nfs4_procedures[NFSPROC4_CLNT_BIND_CONN_TO_SESSION],
+ .rpc_argp = clp,
+ .rpc_resp = &res,
+ };
+
+ dprintk("--> %s\n", __func__);
+ BUG_ON(clp == NULL);
+
+ res.session = kzalloc(sizeof(struct nfs4_session), GFP_KERNEL);
+ if (unlikely(res.session == NULL)) {
+ status = -ENOMEM;
+ goto out;
+ }
+
+ status = rpc_call_sync(clp->cl_rpcclient, &msg, RPC_TASK_TIMEOUT);
+ if (status == 0) {
+ if (memcmp(res.session->sess_id.data,
+ clp->cl_session->sess_id.data, NFS4_MAX_SESSIONID_LEN)) {
+ dprintk("NFS: %s: Session ID mismatch\n", __func__);
+ status = -EIO;
+ goto out_session;
+ }
+ if (res.dir != CDFS4_BOTH) {
+ dprintk("NFS: %s: Unexpected direction from server\n",
+ __func__);
+ status = -EIO;
+ goto out_session;
+ }
+ if (res.use_conn_in_rdma_mode != 0) {
+ dprintk("NFS: %s: Server returned RDMA mode = true\n",
+ __func__);
+ status = -EIO;
+ goto out_session;
+ }
+ }
+out_session:
+ kfree(res.session);
+out:
+ dprintk("<-- %s status= %d\n", __func__, status);
+ return status;
+}
+
+/*
* nfs4_proc_exchange_id()
*
* Since the clientid has expired, all compounds using sessions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index db040e9..37e09c8 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -321,6 +321,16 @@ static int nfs4_stat_to_errno(int);
1 /* csr_flags */ + \
decode_channel_attrs_maxsz + \
decode_channel_attrs_maxsz)
+#define encode_bind_conn_to_session_maxsz (op_encode_hdr_maxsz + \
+ /* bctsa_sessid */ \
+ XDR_QUADLEN(NFS4_MAX_SESSIONID_LEN) + \
+ 1 /* bctsa_dir */ + \
+ 1 /* bctsa_use_conn_in_rdma_mode */)
+#define decode_bind_conn_to_session_maxsz (op_decode_hdr_maxsz + \
+ /* bctsr_sessid */ \
+ XDR_QUADLEN(NFS4_MAX_SESSIONID_LEN) + \
+ 1 /* bctsr_dir */ + \
+ 1 /* bctsr_use_conn_in_rdma_mode */)
#define encode_destroy_session_maxsz (op_encode_hdr_maxsz + 4)
#define decode_destroy_session_maxsz (op_decode_hdr_maxsz)
#define encode_sequence_maxsz (op_encode_hdr_maxsz + \
@@ -714,6 +724,12 @@ static int nfs4_stat_to_errno(int);
decode_putfh_maxsz + \
decode_secinfo_maxsz)
#if defined(CONFIG_NFS_V4_1)
+#define NFS4_enc_bind_conn_to_session_sz \
+ (compound_encode_hdr_maxsz + \
+ encode_bind_conn_to_session_maxsz)
+#define NFS4_dec_bind_conn_to_session_sz \
+ (compound_decode_hdr_maxsz + \
+ decode_bind_conn_to_session_maxsz)
#define NFS4_enc_exchange_id_sz \
(compound_encode_hdr_maxsz + \
encode_exchange_id_maxsz)
@@ -1654,6 +1670,20 @@ static void encode_secinfo(struct xdr_stream *xdr, const struct qstr *name, stru
#if defined(CONFIG_NFS_V4_1)
/* NFSv4.1 operations */
+static void encode_bind_conn_to_session(struct xdr_stream *xdr,
+ struct nfs4_session *session,
+ struct compound_hdr *hdr)
+{
+ __be32 *p;
+
+ encode_op_hdr(xdr, OP_BIND_CONN_TO_SESSION,
+ decode_bind_conn_to_session_maxsz, hdr);
+ encode_opaque_fixed(xdr, session->sess_id.data, NFS4_MAX_SESSIONID_LEN);
+ p = xdr_reserve_space(xdr, 8);
+ *p++ = cpu_to_be32(NFS4_CDFC4_BACK_OR_BOTH);
+ *p = 0; /* use_conn_in_rdma_mode = False */
+}
+
static void encode_exchange_id(struct xdr_stream *xdr,
struct nfs41_exchange_id_args *args,
struct compound_hdr *hdr)
@@ -2614,6 +2644,22 @@ static void nfs4_xdr_enc_secinfo(struct rpc_rqst *req,
#if defined(CONFIG_NFS_V4_1)
/*
+ * BIND_CONN_TO_SESSION request
+ */
+static void nfs4_xdr_enc_bind_conn_to_session(struct rpc_rqst *req,
+ struct xdr_stream *xdr,
+ struct nfs_client *clp)
+{
+ struct compound_hdr hdr = {
+ .minorversion = clp->cl_mvops->minor_version,
+ };
+
+ encode_compound_hdr(xdr, req, &hdr);
+ encode_bind_conn_to_session(xdr, clp->cl_session, &hdr);
+ encode_nops(&hdr);
+}
+
+/*
* EXCHANGE_ID request
*/
static void nfs4_xdr_enc_exchange_id(struct rpc_rqst *req,
@@ -5239,6 +5285,32 @@ static int decode_sessionid(struct xdr_stream *xdr, struct nfs4_sessionid *sid)
return decode_opaque_fixed(xdr, sid->data, NFS4_MAX_SESSIONID_LEN);
}
+static int decode_bind_conn_to_session(struct xdr_stream *xdr,
+ struct nfs41_bind_conn_to_session_res *res)
+{
+ __be32 *p;
+ int status;
+
+ status = decode_op_hdr(xdr, OP_BIND_CONN_TO_SESSION);
+ if (!status)
+ status = decode_sessionid(xdr, &res->session->sess_id);
+ if (unlikely(status))
+ return status;
+
+ /* dir flags, rdma mode bool */
+ p = xdr_inline_decode(xdr, 8);
+ if (unlikely(!p))
+ goto out_overflow;
+
+ res->dir = be32_to_cpup(p++);
+ res->use_conn_in_rdma_mode = be32_to_cpup(p);
+
+ return 0;
+out_overflow:
+ print_overflow_msg(__func__, xdr);
+ return -EIO;
+}
+
static int decode_create_session(struct xdr_stream *xdr,
struct nfs41_create_session_res *res)
{
@@ -6521,6 +6593,22 @@ out:
#if defined(CONFIG_NFS_V4_1)
/*
+ * Decode BIND_CONN_TO_SESSION response
+ */
+static int nfs4_xdr_dec_bind_conn_to_session(struct rpc_rqst *rqstp,
+ struct xdr_stream *xdr,
+ void *res)
+{
+ struct compound_hdr hdr;
+ int status;
+
+ status = decode_compound_hdr(xdr, &hdr);
+ if (!status)
+ status = decode_bind_conn_to_session(xdr, res);
+ return status;
+}
+
+/*
* Decode EXCHANGE_ID response
*/
static int nfs4_xdr_dec_exchange_id(struct rpc_rqst *rqstp,
@@ -7001,6 +7089,8 @@ struct rpc_procinfo nfs4_procedures[] = {
PROC(RELEASE_LOCKOWNER, enc_release_lockowner, dec_release_lockowner),
PROC(SECINFO, enc_secinfo, dec_secinfo),
#if defined(CONFIG_NFS_V4_1)
+ PROC(BIND_CONN_TO_SESSION,
+ enc_bind_conn_to_session, dec_bind_conn_to_session),
PROC(EXCHANGE_ID, enc_exchange_id, dec_exchange_id),
PROC(CREATE_SESSION, enc_create_session, dec_create_session),
PROC(DESTROY_SESSION, enc_destroy_session, dec_destroy_session),
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index 0987146..80fbbfc6 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -69,6 +69,10 @@
#define NFS4_CDFC4_FORE_OR_BOTH 0x3
#define NFS4_CDFC4_BACK_OR_BOTH 0x7
+#define CDFS4_FORE 0x1
+#define CDFS4_BACK 0x2
+#define CDFS4_BOTH 0x3
+
#define NFS4_SET_TO_SERVER_TIME 0
#define NFS4_SET_TO_CLIENT_TIME 1
@@ -582,6 +586,7 @@ enum {
NFSPROC4_CLNT_SECINFO,
/* nfs41 */
+ NFSPROC4_CLNT_BIND_CONN_TO_SESSION,
NFSPROC4_CLNT_EXCHANGE_ID,
NFSPROC4_CLNT_CREATE_SESSION,
NFSPROC4_CLNT_DESTROY_SESSION,
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 2e53a3f..dd3bc2f 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1115,6 +1115,12 @@ struct nfs41_impl_id {
struct nfstime4 date;
};
+struct nfs41_bind_conn_to_session_res {
+ struct nfs4_session *session;
+ u32 dir;
+ u32 use_conn_in_rdma_mode;
+};
+
struct nfs41_exchange_id_res {
struct nfs_client *client;
u32 flags;
--
1.7.4.4
On May 24, 2012, at 4:39 PM, Myklebust, Trond wrote:
> On Thu, 2012-05-24 at 12:26 -0400, Weston Andros Adamson wrote:
>> The state manager can handle SEQ4_STATUS_CB_PATH_DOWN* flags with a
>> BIND_CONN_TO_SESSION instead of destroying the session and creating a new one.
>>
>> Signed-off-by: Weston Andros Adamson <[email protected]>
>> ---
>> fs/nfs/nfs4_fs.h | 1 +
>> fs/nfs/nfs4state.c | 26 +++++++++++++++++++++-----
>> 2 files changed, 22 insertions(+), 5 deletions(-)
>>
>> diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
>> index ad90bc7..9feff0f 100644
>> --- a/fs/nfs/nfs4_fs.h
>> +++ b/fs/nfs/nfs4_fs.h
>> @@ -24,6 +24,7 @@ enum nfs4_client_state {
>> NFS4CLNT_RECALL_SLOT,
>> NFS4CLNT_LEASE_CONFIRM,
>> NFS4CLNT_SERVER_SCOPE_MISMATCH,
>> + NFS4CLNT_BIND_CONN_TO_SESSION,
>> };
>>
>> enum nfs4_session_state {
>> diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
>> index 7f0fcfc..40558ca 100644
>> --- a/fs/nfs/nfs4state.c
>> +++ b/fs/nfs/nfs4state.c
>> @@ -1639,13 +1639,20 @@ static void nfs41_handle_recallable_state_revoked(struct nfs_client *clp)
>> nfs_expire_all_delegations(clp);
>> }
>>
>> -static void nfs41_handle_cb_path_down(struct nfs_client *clp)
>> +static void nfs41_handle_backchannel_fault(struct nfs_client *clp)
>> {
>> nfs_expire_all_delegations(clp);
>> if (test_and_set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state) == 0)
>> nfs4_schedule_state_manager(clp);
>> }
>>
>> +static void nfs41_handle_cb_path_down(struct nfs_client *clp)
>> +{
>> + if (test_and_set_bit(NFS4CLNT_BIND_CONN_TO_SESSION,
>> + &clp->cl_state) == 0)
>> + nfs4_schedule_state_manager(clp);
>> +}
>> +
>> void nfs41_handle_sequence_flag_errors(struct nfs_client *clp, u32 flags)
>> {
>> if (!flags)
>> @@ -1659,9 +1666,10 @@ void nfs41_handle_sequence_flag_errors(struct nfs_client *clp, u32 flags)
>> nfs41_handle_state_revoked(clp);
>> if (flags & SEQ4_STATUS_RECALLABLE_STATE_REVOKED)
>> nfs41_handle_recallable_state_revoked(clp);
>> - if (flags & (SEQ4_STATUS_CB_PATH_DOWN |
>> - SEQ4_STATUS_BACKCHANNEL_FAULT |
>> - SEQ4_STATUS_CB_PATH_DOWN_SESSION))
>> + if (flags & SEQ4_STATUS_BACKCHANNEL_FAULT)
>> + nfs41_handle_backchannel_fault(clp);
>> + else if (flags & (SEQ4_STATUS_CB_PATH_DOWN |
>> + SEQ4_STATUS_CB_PATH_DOWN_SESSION))
>> nfs41_handle_cb_path_down(clp);
>> }
>>
>> @@ -1721,7 +1729,6 @@ static int nfs4_recall_slot(struct nfs_client *clp)
>> nfs4_end_drain_session(clp);
>> return 0;
>> }
>> -
>> #else /* CONFIG_NFS_V4_1 */
>> static int nfs4_reset_session(struct nfs_client *clp) { return 0; }
>> static int nfs4_end_drain_session(struct nfs_client *clp) { return 0; }
>> @@ -1803,6 +1810,15 @@ static void nfs4_state_manager(struct nfs_client *clp)
>> goto out_error;
>> }
>>
>> + /* Send BIND_CONN_TO_SESSION */
>> + if (clp->cl_mvops->minor_version == 1 &&
>> + test_and_clear_bit(NFS4CLNT_BIND_CONN_TO_SESSION,
>> + &clp->cl_state) && nfs4_has_session(clp)) {
>> + status = nfs4_proc_bind_conn_to_session(clp);
>> + if (status < 0)
>> + goto out_error;
>> + }
>> +
>> /* First recover reboot state... */
>> if (test_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state)) {
>> status = nfs4_do_reclaim(clp,
>
> Committed after fixing ifndef CONFIG_NFS_V4_1 issues and adding a
Ah, I actually did test with CONFIG_NFS_V4_1 undefined - it compiles, but you're right, this should be #ifdef'd
> clear_bit() for NFS4CLNT_BIND_CONN_TO_SESSION in nfs4_reset_session.
Good catch.
Thanks!
-dros
On May 24, 2012, at 5:00 PM, Adamson, Dros wrote:
>
> On May 24, 2012, at 4:39 PM, Myklebust, Trond wrote:
>
>> On Thu, 2012-05-24 at 12:26 -0400, Weston Andros Adamson wrote:
>>> The state manager can handle SEQ4_STATUS_CB_PATH_DOWN* flags with a
>>> BIND_CONN_TO_SESSION instead of destroying the session and creating a new one.
>>>
>>> Signed-off-by: Weston Andros Adamson <[email protected]>
>>> ---
>>> fs/nfs/nfs4_fs.h | 1 +
>>> fs/nfs/nfs4state.c | 26 +++++++++++++++++++++-----
>>> 2 files changed, 22 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
>>> index ad90bc7..9feff0f 100644
>>> --- a/fs/nfs/nfs4_fs.h
>>> +++ b/fs/nfs/nfs4_fs.h
>>> @@ -24,6 +24,7 @@ enum nfs4_client_state {
>>> NFS4CLNT_RECALL_SLOT,
>>> NFS4CLNT_LEASE_CONFIRM,
>>> NFS4CLNT_SERVER_SCOPE_MISMATCH,
>>> + NFS4CLNT_BIND_CONN_TO_SESSION,
>>> };
>>>
>>> enum nfs4_session_state {
>>> diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
>>> index 7f0fcfc..40558ca 100644
>>> --- a/fs/nfs/nfs4state.c
>>> +++ b/fs/nfs/nfs4state.c
>>> @@ -1639,13 +1639,20 @@ static void nfs41_handle_recallable_state_revoked(struct nfs_client *clp)
>>> nfs_expire_all_delegations(clp);
>>> }
>>>
>>> -static void nfs41_handle_cb_path_down(struct nfs_client *clp)
>>> +static void nfs41_handle_backchannel_fault(struct nfs_client *clp)
>>> {
>>> nfs_expire_all_delegations(clp);
>>> if (test_and_set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state) == 0)
>>> nfs4_schedule_state_manager(clp);
>>> }
>>>
>>> +static void nfs41_handle_cb_path_down(struct nfs_client *clp)
>>> +{
>>> + if (test_and_set_bit(NFS4CLNT_BIND_CONN_TO_SESSION,
>>> + &clp->cl_state) == 0)
>>> + nfs4_schedule_state_manager(clp);
>>> +}
>>> +
>>> void nfs41_handle_sequence_flag_errors(struct nfs_client *clp, u32 flags)
>>> {
>>> if (!flags)
>>> @@ -1659,9 +1666,10 @@ void nfs41_handle_sequence_flag_errors(struct nfs_client *clp, u32 flags)
>>> nfs41_handle_state_revoked(clp);
>>> if (flags & SEQ4_STATUS_RECALLABLE_STATE_REVOKED)
>>> nfs41_handle_recallable_state_revoked(clp);
>>> - if (flags & (SEQ4_STATUS_CB_PATH_DOWN |
>>> - SEQ4_STATUS_BACKCHANNEL_FAULT |
>>> - SEQ4_STATUS_CB_PATH_DOWN_SESSION))
>>> + if (flags & SEQ4_STATUS_BACKCHANNEL_FAULT)
>>> + nfs41_handle_backchannel_fault(clp);
>>> + else if (flags & (SEQ4_STATUS_CB_PATH_DOWN |
>>> + SEQ4_STATUS_CB_PATH_DOWN_SESSION))
>>> nfs41_handle_cb_path_down(clp);
>>> }
>>>
>>> @@ -1721,7 +1729,6 @@ static int nfs4_recall_slot(struct nfs_client *clp)
>>> nfs4_end_drain_session(clp);
>>> return 0;
>>> }
>>> -
>>> #else /* CONFIG_NFS_V4_1 */
>>> static int nfs4_reset_session(struct nfs_client *clp) { return 0; }
>>> static int nfs4_end_drain_session(struct nfs_client *clp) { return 0; }
>>> @@ -1803,6 +1810,15 @@ static void nfs4_state_manager(struct nfs_client *clp)
>>> goto out_error;
>>> }
>>>
>>> + /* Send BIND_CONN_TO_SESSION */
>>> + if (clp->cl_mvops->minor_version == 1 &&
>>> + test_and_clear_bit(NFS4CLNT_BIND_CONN_TO_SESSION,
>>> + &clp->cl_state) && nfs4_has_session(clp)) {
>>> + status = nfs4_proc_bind_conn_to_session(clp);
>>> + if (status < 0)
>>> + goto out_error;
>>> + }
>>> +
>>> /* First recover reboot state... */
>>> if (test_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state)) {
>>> status = nfs4_do_reclaim(clp,
>>
>> Committed after fixing ifndef CONFIG_NFS_V4_1 issues and adding a
>
> Ah, I actually did test with CONFIG_NFS_V4_1 undefined - it compiles, but you're right, this should be #ifdef'd
Oops, actually that was an older patch with a wrapper around nfs4_proc_bind_conn_to_session - I'll add it back.
-dros
>
>> clear_bit() for NFS4CLNT_BIND_CONN_TO_SESSION in nfs4_reset_session.
>
> Good catch.
>
> Thanks!
> -dros
>
The state manager can handle SEQ4_STATUS_CB_PATH_DOWN* flags with a
BIND_CONN_TO_SESSION instead of destroying the session and creating a new one.
Signed-off-by: Weston Andros Adamson <[email protected]>
---
fs/nfs/nfs4_fs.h | 1 +
fs/nfs/nfs4state.c | 26 +++++++++++++++++++++-----
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index ad90bc7..9feff0f 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -24,6 +24,7 @@ enum nfs4_client_state {
NFS4CLNT_RECALL_SLOT,
NFS4CLNT_LEASE_CONFIRM,
NFS4CLNT_SERVER_SCOPE_MISMATCH,
+ NFS4CLNT_BIND_CONN_TO_SESSION,
};
enum nfs4_session_state {
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 7f0fcfc..40558ca 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1639,13 +1639,20 @@ static void nfs41_handle_recallable_state_revoked(struct nfs_client *clp)
nfs_expire_all_delegations(clp);
}
-static void nfs41_handle_cb_path_down(struct nfs_client *clp)
+static void nfs41_handle_backchannel_fault(struct nfs_client *clp)
{
nfs_expire_all_delegations(clp);
if (test_and_set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state) == 0)
nfs4_schedule_state_manager(clp);
}
+static void nfs41_handle_cb_path_down(struct nfs_client *clp)
+{
+ if (test_and_set_bit(NFS4CLNT_BIND_CONN_TO_SESSION,
+ &clp->cl_state) == 0)
+ nfs4_schedule_state_manager(clp);
+}
+
void nfs41_handle_sequence_flag_errors(struct nfs_client *clp, u32 flags)
{
if (!flags)
@@ -1659,9 +1666,10 @@ void nfs41_handle_sequence_flag_errors(struct nfs_client *clp, u32 flags)
nfs41_handle_state_revoked(clp);
if (flags & SEQ4_STATUS_RECALLABLE_STATE_REVOKED)
nfs41_handle_recallable_state_revoked(clp);
- if (flags & (SEQ4_STATUS_CB_PATH_DOWN |
- SEQ4_STATUS_BACKCHANNEL_FAULT |
- SEQ4_STATUS_CB_PATH_DOWN_SESSION))
+ if (flags & SEQ4_STATUS_BACKCHANNEL_FAULT)
+ nfs41_handle_backchannel_fault(clp);
+ else if (flags & (SEQ4_STATUS_CB_PATH_DOWN |
+ SEQ4_STATUS_CB_PATH_DOWN_SESSION))
nfs41_handle_cb_path_down(clp);
}
@@ -1721,7 +1729,6 @@ static int nfs4_recall_slot(struct nfs_client *clp)
nfs4_end_drain_session(clp);
return 0;
}
-
#else /* CONFIG_NFS_V4_1 */
static int nfs4_reset_session(struct nfs_client *clp) { return 0; }
static int nfs4_end_drain_session(struct nfs_client *clp) { return 0; }
@@ -1803,6 +1810,15 @@ static void nfs4_state_manager(struct nfs_client *clp)
goto out_error;
}
+ /* Send BIND_CONN_TO_SESSION */
+ if (clp->cl_mvops->minor_version == 1 &&
+ test_and_clear_bit(NFS4CLNT_BIND_CONN_TO_SESSION,
+ &clp->cl_state) && nfs4_has_session(clp)) {
+ status = nfs4_proc_bind_conn_to_session(clp);
+ if (status < 0)
+ goto out_error;
+ }
+
/* First recover reboot state... */
if (test_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state)) {
status = nfs4_do_reclaim(clp,
--
1.7.4.4
T24gVGh1LCAyMDEyLTA1LTI0IGF0IDEyOjI2IC0wNDAwLCBXZXN0b24gQW5kcm9zIEFkYW1zb24g
d3JvdGU6DQo+IFRoZSBzdGF0ZSBtYW5hZ2VyIGNhbiBoYW5kbGUgU0VRNF9TVEFUVVNfQ0JfUEFU
SF9ET1dOKiBmbGFncyB3aXRoIGENCj4gQklORF9DT05OX1RPX1NFU1NJT04gaW5zdGVhZCBvZiBk
ZXN0cm95aW5nIHRoZSBzZXNzaW9uIGFuZCBjcmVhdGluZyBhIG5ldyBvbmUuDQo+IA0KPiBTaWdu
ZWQtb2ZmLWJ5OiBXZXN0b24gQW5kcm9zIEFkYW1zb24gPGRyb3NAbmV0YXBwLmNvbT4NCj4gLS0t
DQo+ICBmcy9uZnMvbmZzNF9mcy5oICAgfCAgICAxICsNCj4gIGZzL25mcy9uZnM0c3RhdGUuYyB8
ICAgMjYgKysrKysrKysrKysrKysrKysrKysrLS0tLS0NCj4gIDIgZmlsZXMgY2hhbmdlZCwgMjIg
aW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkNCj4gDQo+IGRpZmYgLS1naXQgYS9mcy9uZnMv
bmZzNF9mcy5oIGIvZnMvbmZzL25mczRfZnMuaA0KPiBpbmRleCBhZDkwYmM3Li45ZmVmZjBmIDEw
MDY0NA0KPiAtLS0gYS9mcy9uZnMvbmZzNF9mcy5oDQo+ICsrKyBiL2ZzL25mcy9uZnM0X2ZzLmgN
Cj4gQEAgLTI0LDYgKzI0LDcgQEAgZW51bSBuZnM0X2NsaWVudF9zdGF0ZSB7DQo+ICAJTkZTNENM
TlRfUkVDQUxMX1NMT1QsDQo+ICAJTkZTNENMTlRfTEVBU0VfQ09ORklSTSwNCj4gIAlORlM0Q0xO
VF9TRVJWRVJfU0NPUEVfTUlTTUFUQ0gsDQo+ICsJTkZTNENMTlRfQklORF9DT05OX1RPX1NFU1NJ
T04sDQo+ICB9Ow0KPiAgDQo+ICBlbnVtIG5mczRfc2Vzc2lvbl9zdGF0ZSB7DQo+IGRpZmYgLS1n
aXQgYS9mcy9uZnMvbmZzNHN0YXRlLmMgYi9mcy9uZnMvbmZzNHN0YXRlLmMNCj4gaW5kZXggN2Yw
ZmNmYy4uNDA1NThjYSAxMDA2NDQNCj4gLS0tIGEvZnMvbmZzL25mczRzdGF0ZS5jDQo+ICsrKyBi
L2ZzL25mcy9uZnM0c3RhdGUuYw0KPiBAQCAtMTYzOSwxMyArMTYzOSwyMCBAQCBzdGF0aWMgdm9p
ZCBuZnM0MV9oYW5kbGVfcmVjYWxsYWJsZV9zdGF0ZV9yZXZva2VkKHN0cnVjdCBuZnNfY2xpZW50
ICpjbHApDQo+ICAJbmZzX2V4cGlyZV9hbGxfZGVsZWdhdGlvbnMoY2xwKTsNCj4gIH0NCj4gIA0K
PiAtc3RhdGljIHZvaWQgbmZzNDFfaGFuZGxlX2NiX3BhdGhfZG93bihzdHJ1Y3QgbmZzX2NsaWVu
dCAqY2xwKQ0KPiArc3RhdGljIHZvaWQgbmZzNDFfaGFuZGxlX2JhY2tjaGFubmVsX2ZhdWx0KHN0
cnVjdCBuZnNfY2xpZW50ICpjbHApDQo+ICB7DQo+ICAJbmZzX2V4cGlyZV9hbGxfZGVsZWdhdGlv
bnMoY2xwKTsNCj4gIAlpZiAodGVzdF9hbmRfc2V0X2JpdChORlM0Q0xOVF9TRVNTSU9OX1JFU0VU
LCAmY2xwLT5jbF9zdGF0ZSkgPT0gMCkNCj4gIAkJbmZzNF9zY2hlZHVsZV9zdGF0ZV9tYW5hZ2Vy
KGNscCk7DQo+ICB9DQo+ICANCj4gK3N0YXRpYyB2b2lkIG5mczQxX2hhbmRsZV9jYl9wYXRoX2Rv
d24oc3RydWN0IG5mc19jbGllbnQgKmNscCkNCj4gK3sNCj4gKwlpZiAodGVzdF9hbmRfc2V0X2Jp
dChORlM0Q0xOVF9CSU5EX0NPTk5fVE9fU0VTU0lPTiwNCj4gKwkJJmNscC0+Y2xfc3RhdGUpID09
IDApDQo+ICsJCW5mczRfc2NoZWR1bGVfc3RhdGVfbWFuYWdlcihjbHApOw0KPiArfQ0KPiArDQo+
ICB2b2lkIG5mczQxX2hhbmRsZV9zZXF1ZW5jZV9mbGFnX2Vycm9ycyhzdHJ1Y3QgbmZzX2NsaWVu
dCAqY2xwLCB1MzIgZmxhZ3MpDQo+ICB7DQo+ICAJaWYgKCFmbGFncykNCj4gQEAgLTE2NTksOSAr
MTY2NiwxMCBAQCB2b2lkIG5mczQxX2hhbmRsZV9zZXF1ZW5jZV9mbGFnX2Vycm9ycyhzdHJ1Y3Qg
bmZzX2NsaWVudCAqY2xwLCB1MzIgZmxhZ3MpDQo+ICAJCW5mczQxX2hhbmRsZV9zdGF0ZV9yZXZv
a2VkKGNscCk7DQo+ICAJaWYgKGZsYWdzICYgU0VRNF9TVEFUVVNfUkVDQUxMQUJMRV9TVEFURV9S
RVZPS0VEKQ0KPiAgCQluZnM0MV9oYW5kbGVfcmVjYWxsYWJsZV9zdGF0ZV9yZXZva2VkKGNscCk7
DQo+IC0JaWYgKGZsYWdzICYgKFNFUTRfU1RBVFVTX0NCX1BBVEhfRE9XTiB8DQo+IC0JCQkgICAg
U0VRNF9TVEFUVVNfQkFDS0NIQU5ORUxfRkFVTFQgfA0KPiAtCQkJICAgIFNFUTRfU1RBVFVTX0NC
X1BBVEhfRE9XTl9TRVNTSU9OKSkNCj4gKwlpZiAoZmxhZ3MgJiBTRVE0X1NUQVRVU19CQUNLQ0hB
Tk5FTF9GQVVMVCkNCj4gKwkJbmZzNDFfaGFuZGxlX2JhY2tjaGFubmVsX2ZhdWx0KGNscCk7DQo+
ICsJZWxzZSBpZiAoZmxhZ3MgJiAoU0VRNF9TVEFUVVNfQ0JfUEFUSF9ET1dOIHwNCj4gKwkJCQlT
RVE0X1NUQVRVU19DQl9QQVRIX0RPV05fU0VTU0lPTikpDQo+ICAJCW5mczQxX2hhbmRsZV9jYl9w
YXRoX2Rvd24oY2xwKTsNCj4gIH0NCj4gIA0KPiBAQCAtMTcyMSw3ICsxNzI5LDYgQEAgc3RhdGlj
IGludCBuZnM0X3JlY2FsbF9zbG90KHN0cnVjdCBuZnNfY2xpZW50ICpjbHApDQo+ICAJbmZzNF9l
bmRfZHJhaW5fc2Vzc2lvbihjbHApOw0KPiAgCXJldHVybiAwOw0KPiAgfQ0KPiAtDQo+ICAjZWxz
ZSAvKiBDT05GSUdfTkZTX1Y0XzEgKi8NCj4gIHN0YXRpYyBpbnQgbmZzNF9yZXNldF9zZXNzaW9u
KHN0cnVjdCBuZnNfY2xpZW50ICpjbHApIHsgcmV0dXJuIDA7IH0NCj4gIHN0YXRpYyBpbnQgbmZz
NF9lbmRfZHJhaW5fc2Vzc2lvbihzdHJ1Y3QgbmZzX2NsaWVudCAqY2xwKSB7IHJldHVybiAwOyB9
DQo+IEBAIC0xODAzLDYgKzE4MTAsMTUgQEAgc3RhdGljIHZvaWQgbmZzNF9zdGF0ZV9tYW5hZ2Vy
KHN0cnVjdCBuZnNfY2xpZW50ICpjbHApDQo+ICAJCQkJZ290byBvdXRfZXJyb3I7DQo+ICAJCX0N
Cj4gIA0KPiArCQkvKiBTZW5kIEJJTkRfQ09OTl9UT19TRVNTSU9OICovDQo+ICsJCWlmIChjbHAt
PmNsX212b3BzLT5taW5vcl92ZXJzaW9uID09IDEgJiYNCj4gKwkJICAgIHRlc3RfYW5kX2NsZWFy
X2JpdChORlM0Q0xOVF9CSU5EX0NPTk5fVE9fU0VTU0lPTiwNCj4gKwkJCQkmY2xwLT5jbF9zdGF0
ZSkgJiYgbmZzNF9oYXNfc2Vzc2lvbihjbHApKSB7DQo+ICsJCQlzdGF0dXMgPSBuZnM0X3Byb2Nf
YmluZF9jb25uX3RvX3Nlc3Npb24oY2xwKTsNCj4gKwkJCWlmIChzdGF0dXMgPCAwKQ0KPiArCQkJ
CWdvdG8gb3V0X2Vycm9yOw0KPiArCQl9DQo+ICsNCj4gIAkJLyogRmlyc3QgcmVjb3ZlciByZWJv
b3Qgc3RhdGUuLi4gKi8NCj4gIAkJaWYgKHRlc3RfYml0KE5GUzRDTE5UX1JFQ0xBSU1fUkVCT09U
LCAmY2xwLT5jbF9zdGF0ZSkpIHsNCj4gIAkJCXN0YXR1cyA9IG5mczRfZG9fcmVjbGFpbShjbHAs
DQoNCkNvbW1pdHRlZCBhZnRlciBmaXhpbmcgaWZuZGVmIENPTkZJR19ORlNfVjRfMSBpc3N1ZXMg
YW5kIGFkZGluZyBhDQpjbGVhcl9iaXQoKSBmb3IgTkZTNENMTlRfQklORF9DT05OX1RPX1NFU1NJ
T04gaW4gbmZzNF9yZXNldF9zZXNzaW9uLg0KDQotLSANClRyb25kIE15a2xlYnVzdA0KTGludXgg
TkZTIGNsaWVudCBtYWludGFpbmVyDQoNCk5ldEFwcA0KVHJvbmQuTXlrbGVidXN0QG5ldGFwcC5j
b20NCnd3dy5uZXRhcHAuY29tDQoNCg==