android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFS: Lock the slot table from a single place during setup sequence

Browse Source 
Rather than implementing this twice for NFS v4.0 and v4.1

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
Anna Schumaker 2017-01-10 16:13:27 -05:00
parent 9dd9107f33
commit 6994cdd798
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fs/nfs/nfs4proc.c
View File

@ -629,7 +629,6 @@ static int nfs40_setup_sequence(struct nfs4_slot_table *tbl,
{ {
struct nfs4_slot *slot; struct nfs4_slot *slot;
spin_lock(&tbl->slot_tbl_lock);
if (nfs4_slot_tbl_draining(tbl) && !args->sa_privileged) if (nfs4_slot_tbl_draining(tbl) && !args->sa_privileged)
goto out_sleep; goto out_sleep;
@ -639,13 +638,10 @@ static int nfs40_setup_sequence(struct nfs4_slot_table *tbl,
task->tk_timeout = HZ >> 2; task->tk_timeout = HZ >> 2;
goto out_sleep; goto out_sleep;
} }
spin_unlock(&tbl->slot_tbl_lock);
slot->privileged = args->sa_privileged ? 1 : 0; slot->privileged = args->sa_privileged ? 1 : 0;
args->sa_slot = slot; args->sa_slot = slot;
res->sr_slot = slot; res->sr_slot = slot;
rpc_call_start(task);
return 0; return 0;
out_sleep: out_sleep:
@ -654,7 +650,6 @@ static int nfs40_setup_sequence(struct nfs4_slot_table *tbl,
NULL, RPC_PRIORITY_PRIVILEGED); NULL, RPC_PRIORITY_PRIVILEGED);
else else
rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL); rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL);
spin_unlock(&tbl->slot_tbl_lock);
return -EAGAIN; return -EAGAIN;
} }
@ -889,7 +884,6 @@ static int nfs41_setup_sequence(struct nfs4_session *session,
task->tk_timeout = 0; task->tk_timeout = 0;
spin_lock(&tbl->slot_tbl_lock);
if (test_bit(NFS4_SLOT_TBL_DRAINING, &tbl->slot_tbl_state) && if (test_bit(NFS4_SLOT_TBL_DRAINING, &tbl->slot_tbl_state) &&
!args->sa_privileged) { !args->sa_privileged) {
/* The state manager will wait until the slot table is empty */ /* The state manager will wait until the slot table is empty */
@ -905,7 +899,6 @@ static int nfs41_setup_sequence(struct nfs4_session *session,
dprintk("<-- %s: no free slots\n", __func__); dprintk("<-- %s: no free slots\n", __func__);
goto out_sleep; goto out_sleep;
} }
spin_unlock(&tbl->slot_tbl_lock);
slot->privileged = args->sa_privileged ? 1 : 0; slot->privileged = args->sa_privileged ? 1 : 0;
args->sa_slot = slot; args->sa_slot = slot;
@ -922,7 +915,6 @@ static int nfs41_setup_sequence(struct nfs4_session *session,
*/ */
res->sr_status = 1; res->sr_status = 1;
trace_nfs4_setup_sequence(session, args); trace_nfs4_setup_sequence(session, args);
rpc_call_start(task);
return 0; return 0;
out_sleep: out_sleep:
/* Privileged tasks are queued with top priority */ /* Privileged tasks are queued with top priority */
@ -931,7 +923,6 @@ static int nfs41_setup_sequence(struct nfs4_session *session,
NULL, RPC_PRIORITY_PRIVILEGED); NULL, RPC_PRIORITY_PRIVILEGED);
else else
rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL); rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL);
spin_unlock(&tbl->slot_tbl_lock);
return -EAGAIN; return -EAGAIN;
} }
@ -984,19 +975,27 @@ int nfs4_setup_sequence(const struct nfs_client *client,
struct nfs4_sequence_res *res, struct nfs4_sequence_res *res,
struct rpc_task *task) struct rpc_task *task)
{ {
#if defined(CONFIG_NFS_V4_1)
struct nfs4_session *session = nfs4_get_session(client); struct nfs4_session *session = nfs4_get_session(client);
#endif /* CONFIG_NFS_V4_1 */ struct nfs4_slot_table *tbl = session ? &session->fc_slot_table :
client->cl_slot_tbl;
int ret;
/* slot already allocated? */ /* slot already allocated? */
if (res->sr_slot != NULL) if (res->sr_slot != NULL)
goto out_start; goto out_start;
spin_lock(&tbl->slot_tbl_lock);
#if defined(CONFIG_NFS_V4_1) #if defined(CONFIG_NFS_V4_1)
if (session) if (session)
return nfs41_setup_sequence(session, args, res, task); ret = nfs41_setup_sequence(session, args, res, task);
else
#endif /* CONFIG_NFS_V4_1 */ #endif /* CONFIG_NFS_V4_1 */
return nfs40_setup_sequence(client->cl_slot_tbl, args, res, task); ret = nfs40_setup_sequence(client->cl_slot_tbl, args, res, task);
spin_unlock(&tbl->slot_tbl_lock);
if (ret < 0)
return ret;
out_start: out_start:
rpc_call_start(task); rpc_call_start(task);