diff options
author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-10-17 15:15:13 +0300 |
---|---|---|
committer | Luis Henriques <luis.henriques@canonical.com> | 2014-11-27 11:21:46 +0000 |
commit | 6bcacd764cdcb0086bf2bd6bee6b1e7f913b4735 (patch) | |
tree | 8764422db9fab1731ca30bd6044684b16c7de089 /fs | |
parent | c37089e08915ca0908db4f3a72306deda8c8f17a (diff) | |
download | linux-stable-6bcacd764cdcb0086bf2bd6bee6b1e7f913b4735.tar.gz linux-stable-6bcacd764cdcb0086bf2bd6bee6b1e7f913b4735.tar.bz2 linux-stable-6bcacd764cdcb0086bf2bd6bee6b1e7f913b4735.zip |
NFSv4: Ensure that we call FREE_STATEID when NFSv4.x stateids are revoked
commit c606bb8857921d3ecf4d353942d6cc7e116cc75a upstream.
NFSv4.x (x>0) requires us to call TEST_STATEID+FREE_STATEID if a stateid is
revoked. We will currently fail to do this if the stateid is a delegation.
http://lkml.kernel.org/r/CAN-5tyHwG=Cn2Q9KsHWadewjpTTy_K26ee+UnSvHvG4192p-Xw@mail.gmail.com
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfs/filelayout/filelayout.c | 3 | ||||
-rw-r--r-- | fs/nfs/nfs4proc.c | 8 |
2 files changed, 0 insertions, 11 deletions
diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c index a596a1938b52..b2f8f17dcc3b 100644 --- a/fs/nfs/filelayout/filelayout.c +++ b/fs/nfs/filelayout/filelayout.c @@ -151,9 +151,6 @@ static int filelayout_async_handle_error(struct rpc_task *task, case -NFS4ERR_DELEG_REVOKED: case -NFS4ERR_ADMIN_REVOKED: case -NFS4ERR_BAD_STATEID: - if (state == NULL) - break; - nfs_remove_bad_delegation(state->inode); case -NFS4ERR_OPENMODE: if (state == NULL) break; diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 23d982183aac..2768d382a4d1 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -360,11 +360,6 @@ static int nfs4_handle_exception(struct nfs_server *server, int errorcode, struc case -NFS4ERR_DELEG_REVOKED: case -NFS4ERR_ADMIN_REVOKED: case -NFS4ERR_BAD_STATEID: - if (inode != NULL && nfs4_have_delegation(inode, FMODE_READ)) { - nfs_remove_bad_delegation(inode); - exception->retry = 1; - break; - } if (state == NULL) break; ret = nfs4_schedule_stateid_recovery(server, state); @@ -4780,9 +4775,6 @@ nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server, case -NFS4ERR_DELEG_REVOKED: case -NFS4ERR_ADMIN_REVOKED: case -NFS4ERR_BAD_STATEID: - if (state == NULL) - break; - nfs_remove_bad_delegation(state->inode); case -NFS4ERR_OPENMODE: if (state == NULL) break; |