AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

NFSv4.1: Allow revoked stateids to skip the call to TEST_STATEID

Browse Source 
In some cases (e.g. when the SEQ4_STATUS_EXPIRED_ALL_STATE_REVOKED sequence
flag is set) we may already know that the stateid was revoked and that the
only valid operation we can call is FREE_STATEID. In those cases, allow
the stateid to carry the information in the type field, so that we skip
the redundant call to TEST_STATEID.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Tested-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
Trond Myklebust 2016-09-22 13:39:02 -04:00 committed by Anna Schumaker
parent 63d63cbf5e
commit f7a62adad0
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fs/nfs/nfs4proc.c
View File

@ -2422,18 +2422,29 @@ static int nfs41_test_and_free_expired_stateid(struct nfs_server *server,
{ {
int status; int status;
status = nfs41_test_stateid(server, stateid, cred); switch (stateid->type) {
default:
break;
case NFS4_INVALID_STATEID_TYPE:
case NFS4_SPECIAL_STATEID_TYPE:
return -NFS4ERR_BAD_STATEID;
case NFS4_REVOKED_STATEID_TYPE:
goto out_free;
}
status = nfs41_test_stateid(server, stateid, cred);
switch (status) { switch (status) {
case -NFS4ERR_EXPIRED: case -NFS4ERR_EXPIRED:
case -NFS4ERR_ADMIN_REVOKED: case -NFS4ERR_ADMIN_REVOKED:
case -NFS4ERR_DELEG_REVOKED: case -NFS4ERR_DELEG_REVOKED:
/* Ack the revoked state to the server */ break;
nfs41_free_stateid(server, stateid, cred); default:
case -NFS4ERR_BAD_STATEID:
return status; return status;
} }
return NFS_OK; out_free:
/* Ack the revoked state to the server */
nfs41_free_stateid(server, stateid, cred);
return -NFS4ERR_EXPIRED;
} }
static void nfs41_check_delegation_stateid(struct nfs4_state *state) static void nfs41_check_delegation_stateid(struct nfs4_state *state)
@ -2468,7 +2479,7 @@ static void nfs41_check_delegation_stateid(struct nfs4_state *state)
rcu_read_unlock(); rcu_read_unlock();
status = nfs41_test_and_free_expired_stateid(server, &stateid, cred); status = nfs41_test_and_free_expired_stateid(server, &stateid, cred);
trace_nfs4_test_delegation_stateid(state, NULL, status); trace_nfs4_test_delegation_stateid(state, NULL, status);
if (status != NFS_OK) if (status == -NFS4ERR_EXPIRED || status == -NFS4ERR_BAD_STATEID)
nfs_finish_clear_delegation_stateid(state, &stateid); nfs_finish_clear_delegation_stateid(state, &stateid);
put_rpccred(cred); put_rpccred(cred);
@ -2497,7 +2508,7 @@ static int nfs41_check_open_stateid(struct nfs4_state *state)
status = nfs41_test_and_free_expired_stateid(server, stateid, cred); status = nfs41_test_and_free_expired_stateid(server, stateid, cred);
trace_nfs4_test_open_stateid(state, NULL, status); trace_nfs4_test_open_stateid(state, NULL, status);
if (status != NFS_OK) { if (status == -NFS4ERR_EXPIRED || status == -NFS4ERR_BAD_STATEID) {
clear_bit(NFS_O_RDONLY_STATE, &state->flags); clear_bit(NFS_O_RDONLY_STATE, &state->flags);
clear_bit(NFS_O_WRONLY_STATE, &state->flags); clear_bit(NFS_O_WRONLY_STATE, &state->flags);
clear_bit(NFS_O_RDWR_STATE, &state->flags); clear_bit(NFS_O_RDWR_STATE, &state->flags);
@ -6105,7 +6116,7 @@ static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request
*/ */
static int nfs41_check_expired_locks(struct nfs4_state *state) static int nfs41_check_expired_locks(struct nfs4_state *state)
{ {
int status, ret = -NFS4ERR_BAD_STATEID; int status, ret = NFS_OK;
struct nfs4_lock_state *lsp; struct nfs4_lock_state *lsp;
struct nfs_server *server = NFS_SERVER(state->inode); struct nfs_server *server = NFS_SERVER(state->inode);
@ -6117,9 +6128,12 @@ static int nfs41_check_expired_locks(struct nfs4_state *state)
&lsp->ls_stateid, &lsp->ls_stateid,
cred); cred);
trace_nfs4_test_lock_stateid(state, lsp, status); trace_nfs4_test_lock_stateid(state, lsp, status);
if (status != NFS_OK) { if (status == -NFS4ERR_EXPIRED ||
status == -NFS4ERR_BAD_STATEID)
clear_bit(NFS_LOCK_INITIALIZED, &lsp->ls_flags); clear_bit(NFS_LOCK_INITIALIZED, &lsp->ls_flags);
else if (status != NFS_OK) {
ret = status; ret = status;
break;
} }
} }
}; };

1
include/linux/nfs4.h
View File

@ -67,6 +67,7 @@ struct nfs4_stateid_struct {
NFS4_DELEGATION_STATEID_TYPE, NFS4_DELEGATION_STATEID_TYPE,
NFS4_LAYOUT_STATEID_TYPE, NFS4_LAYOUT_STATEID_TYPE,
NFS4_PNFS_DS_STATEID_TYPE, NFS4_PNFS_DS_STATEID_TYPE,
NFS4_REVOKED_STATEID_TYPE,
} type; } type;
}; };