UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFS: nfs_inode_find_state_and_recover() fix stateid matching 

In nfs_inode_find_state_and_recover() we want to mark for recovery
only those stateids that match or are older than the supplied
stateid parameter.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Trond Myklebust 2019-10-26 10:16:15 -04:00
parent 3887ce1aac
commit 42c304c34e
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/nfs/delegation.c
View File

@ -1207,7 +1207,8 @@ void nfs_inode_find_delegation_state_and_recover(struct inode *inode,
rcu_read_lock(); rcu_read_lock();
delegation = rcu_dereference(NFS_I(inode)->delegation); delegation = rcu_dereference(NFS_I(inode)->delegation);
if (delegation && if (delegation &&
nfs4_stateid_match_other(&delegation->stateid, stateid)) { nfs4_stateid_match_or_older(&delegation->stateid, stateid) &&
!test_bit(NFS_DELEGATION_REVOKED, &delegation->flags)) {
nfs_mark_test_expired_delegation(NFS_SERVER(inode), delegation); nfs_mark_test_expired_delegation(NFS_SERVER(inode), delegation);
found = true; found = true;
} }

6
fs/nfs/nfs4_fs.h
View File

@ -572,6 +572,12 @@ static inline bool nfs4_stateid_is_newer(const nfs4_stateid *s1, const nfs4_stat
return (s32)(be32_to_cpu(s1->seqid) - be32_to_cpu(s2->seqid)) > 0; return (s32)(be32_to_cpu(s1->seqid) - be32_to_cpu(s2->seqid)) > 0;
} }
static inline bool nfs4_stateid_match_or_older(const nfs4_stateid *dst, const nfs4_stateid *src)
{
return nfs4_stateid_match_other(dst, src) &&
!(src->seqid && nfs4_stateid_is_newer(dst, src));
}
static inline void nfs4_stateid_seqid_inc(nfs4_stateid *s1) static inline void nfs4_stateid_seqid_inc(nfs4_stateid *s1)
{ {
u32 seqid = be32_to_cpu(s1->seqid); u32 seqid = be32_to_cpu(s1->seqid);

7
fs/nfs/nfs4state.c
View File

@ -1407,7 +1407,7 @@ nfs_state_find_lock_state_by_stateid(struct nfs4_state *state,
list_for_each_entry(pos, &state->lock_states, ls_locks) { list_for_each_entry(pos, &state->lock_states, ls_locks) {
if (!test_bit(NFS_LOCK_INITIALIZED, &pos->ls_flags)) if (!test_bit(NFS_LOCK_INITIALIZED, &pos->ls_flags))
continue; continue;
if (nfs4_stateid_match_other(&pos->ls_stateid, stateid)) if (nfs4_stateid_match_or_older(&pos->ls_stateid, stateid))
return pos; return pos;
} }
return NULL; return NULL;
@ -1441,12 +1441,13 @@ void nfs_inode_find_state_and_recover(struct inode *inode,
state = ctx->state; state = ctx->state;
if (state == NULL) if (state == NULL)
continue; continue;
if (nfs4_stateid_match_other(&state->stateid, stateid) && if (nfs4_stateid_match_or_older(&state->stateid, stateid) &&
nfs4_state_mark_reclaim_nograce(clp, state)) { nfs4_state_mark_reclaim_nograce(clp, state)) {
found = true; found = true;
continue; continue;
} }
if (nfs4_stateid_match_other(&state->open_stateid, stateid) && if (test_bit(NFS_OPEN_STATE, &state->flags) &&
nfs4_stateid_match_or_older(&state->open_stateid, stateid) &&
nfs4_state_mark_reclaim_nograce(clp, state)) { nfs4_state_mark_reclaim_nograce(clp, state)) {
found = true; found = true;
continue; continue;