NFSv4: Fix delegation handling in update_open_stateid()

If the delegation is marked as being revoked, then don't use it in
the open state structure.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index caacf5e7f5e1568474feb57f6e4d85aa19efdc8b..217885e328524ad5e35c9f40214011834bf42dcc 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1737,7 +1737,7 @@ static int update_open_stateid(struct nfs4_state *state,
                ret = 1;
        }
 
-       deleg_cur = rcu_dereference(nfsi->delegation);
+       deleg_cur = nfs4_get_valid_delegation(state->inode);
        if (deleg_cur == NULL)
                goto no_delegation;
 
@@ -1749,7 +1749,7 @@ static int update_open_stateid(struct nfs4_state *state,
 
        if (delegation == NULL)
                delegation = &deleg_cur->stateid;
-       else if (!nfs4_stateid_match(&deleg_cur->stateid, delegation))
+       else if (!nfs4_stateid_match_other(&deleg_cur->stateid, delegation))
                goto no_delegation_unlock;
 
        nfs_mark_delegation_referenced(deleg_cur);