Hey Trond, On 11/04/2014 06:36 PM, Trond Myklebust wrote: > 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@xxxxxxxxxxxxxx > Cc: stable@xxxxxxxxxxxxxxx > Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx> > --- > fs/nfs/nfs4proc.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c > index d8f352d8c75f..6cf49af3092d 100644 > --- a/fs/nfs/nfs4proc.c > +++ b/fs/nfs/nfs4proc.c > @@ -370,11 +370,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); > @@ -4849,9 +4844,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); Does filelayout_async_handle_error() need to be updated in the same way? They are the only remaining caller of nfs_remove_bad_delegation(). Thanks, Anna > case -NFS4ERR_OPENMODE: > if (state == NULL) > break; -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
