From: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
This puts the check in a single place, rather than needing to implement
it twice for v4.0 and v4.1.
Signed-off-by: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
---
fs/nfs/nfs4proc.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 132d73435b8f..856d0df8d653 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -630,10 +630,6 @@ static int nfs40_setup_sequence(struct nfs4_slot_table *tbl,
{
struct nfs4_slot *slot;
- /* slot already allocated? */
- if (res->sr_slot != NULL)
- goto out_start;
-
spin_lock(&tbl->slot_tbl_lock);
if (nfs4_slot_tbl_draining(tbl) && !args->sa_privileged)
goto out_sleep;
@@ -650,7 +646,6 @@ static int nfs40_setup_sequence(struct nfs4_slot_table *tbl,
args->sa_slot = slot;
res->sr_slot = slot;
-out_start:
rpc_call_start(task);
return 0;
@@ -891,10 +886,6 @@ static int nfs41_setup_sequence(struct nfs4_session *session,
struct nfs4_slot_table *tbl;
dprintk("--> %s\n", __func__);
- /* slot already allocated? */
- if (res->sr_slot != NULL)
- goto out_success;
-
tbl = &session->fc_slot_table;
task->tk_timeout = 0;
@@ -932,7 +923,6 @@ static int nfs41_setup_sequence(struct nfs4_session *session,
*/
res->sr_status = 1;
trace_nfs4_setup_sequence(session, args);
-out_success:
rpc_call_start(task);
return 0;
out_sleep:
@@ -997,12 +987,21 @@ int nfs4_setup_sequence(const struct nfs_client *client,
{
#if defined(CONFIG_NFS_V4_1)
struct nfs4_session *session = nfs4_get_session(client);
+#endif /* CONFIG_NFS_V4_1 */
+ /* slot already allocated? */
+ if (res->sr_slot != NULL)
+ goto out_start;
+
+#if defined(CONFIG_NFS_V4_1)
if (session)
return nfs41_setup_sequence(session, args, res, task);
#endif /* CONFIG_NFS_V4_1 */
return nfs40_setup_sequence(client->cl_slot_tbl, args, res, task);
+out_start:
+ rpc_call_start(task);
+ return 0;
}
EXPORT_SYMBOL_GPL(nfs4_setup_sequence);
--
2.11.0
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
