aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Schumaker <bjschuma@netapp.com>2012-09-26 15:25:53 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-10-01 18:17:17 -0400
commitfcb6d9c6b719b633e9b98d26d8a7937209e8bf21 (patch)
tree09a1aee073057d0f06ab94dc59c8b7b8963f1e4d
parent9b96ce71974127af0304514d310abe596426c112 (diff)
NFS: Always use the open stateid when checking for expired opens
If we are reading through a delegation, and the delegation is OK then state->stateid will still point to a delegation stateid and not an open stateid. Signed-off-by: Bryan Schumaker <bjschuma@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/nfs4proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index ce1ebff49fd7..755ee162ee7e 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1790,7 +1790,7 @@ static void nfs41_clear_delegation_stateid(struct nfs4_state *state)
1790static int nfs41_check_open_stateid(struct nfs4_state *state) 1790static int nfs41_check_open_stateid(struct nfs4_state *state)
1791{ 1791{
1792 struct nfs_server *server = NFS_SERVER(state->inode); 1792 struct nfs_server *server = NFS_SERVER(state->inode);
1793 nfs4_stateid *stateid = &state->stateid; 1793 nfs4_stateid *stateid = &state->open_stateid;
1794 int status; 1794 int status;
1795 1795
1796 /* If a state reset has been done, test_stateid is unneeded */ 1796 /* If a state reset has been done, test_stateid is unneeded */