diff options
| author | Bryan Schumaker | 2012-09-26 21:25:53 +0200 |
|---|---|---|
| committer | Trond Myklebust | 2012-10-02 00:17:17 +0200 |
| commit | fcb6d9c6b719b633e9b98d26d8a7937209e8bf21 (patch) | |
| tree | 09a1aee073057d0f06ab94dc59c8b7b8963f1e4d | |
| parent | SUNRPC: Limit the rpciod workqueue concurrency (diff) | |
| download | kernel-qcow2-linux-fcb6d9c6b719b633e9b98d26d8a7937209e8bf21.tar.gz kernel-qcow2-linux-fcb6d9c6b719b633e9b98d26d8a7937209e8bf21.tar.xz kernel-qcow2-linux-fcb6d9c6b719b633e9b98d26d8a7937209e8bf21.zip | |
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.c | 2 |
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) static int nfs41_check_open_stateid(struct nfs4_state *state) { struct nfs_server *server = NFS_SERVER(state->inode); - nfs4_stateid *stateid = &state->stateid; + nfs4_stateid *stateid = &state->open_stateid; int status; /* If a state reset has been done, test_stateid is unneeded */ |