hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NFS: Move slot-already-allocated check into nfs_setup_sequence() 

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@Netapp.com>
This commit is contained in:
Anna Schumaker 2017-01-10 12:01:46 -05:00
parent 7981c8a659
commit 9dd9107f33
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fs/nfs/nfs4proc.c
View File

@ -629,10 +629,6 @@ static int nfs40_setup_sequence(struct nfs4_slot_table *tbl,
{ {
struct nfs4_slot *slot; struct nfs4_slot *slot;
/* slot already allocated? */
if (res->sr_slot != NULL)
goto out_start;
spin_lock(&tbl->slot_tbl_lock); 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;
@ -649,7 +645,6 @@ static int nfs40_setup_sequence(struct nfs4_slot_table *tbl,
args->sa_slot = slot; args->sa_slot = slot;
res->sr_slot = slot; res->sr_slot = slot;
out_start:
rpc_call_start(task); rpc_call_start(task);
return 0; return 0;
@ -890,10 +885,6 @@ static int nfs41_setup_sequence(struct nfs4_session *session,
struct nfs4_slot_table *tbl; struct nfs4_slot_table *tbl;
dprintk("--> %s\n", __func__); dprintk("--> %s\n", __func__);
/* slot already allocated? */
if (res->sr_slot != NULL)
goto out_success;
tbl = &session->fc_slot_table; tbl = &session->fc_slot_table;
task->tk_timeout = 0; task->tk_timeout = 0;
@ -931,7 +922,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);
out_success:
rpc_call_start(task); rpc_call_start(task);
return 0; return 0;
out_sleep: out_sleep:
@ -996,12 +986,21 @@ int nfs4_setup_sequence(const struct nfs_client *client,
{ {
#if defined(CONFIG_NFS_V4_1) #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 */
/* slot already allocated? */
if (res->sr_slot != NULL)
goto out_start;
#if defined(CONFIG_NFS_V4_1)
if (session) if (session)
return nfs41_setup_sequence(session, args, res, task); return nfs41_setup_sequence(session, args, res, task);
#endif /* CONFIG_NFS_V4_1 */ #endif /* CONFIG_NFS_V4_1 */
return nfs40_setup_sequence(client->cl_slot_tbl, args, res, task); 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); EXPORT_SYMBOL_GPL(nfs4_setup_sequence);