diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-03-05 00:13:56 +0100 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-03-06 16:32:44 +0100 |
commit | 8e663f0e5fabf57065aed1cfdaff5b13057dce23 (patch) | |
tree | 844f5568113fe1c43a6d4ac93e9dfd5452682e06 /fs/nfs/delegation.c | |
parent | NFS: Properly handle the case where the delegation is revoked (diff) | |
download | linux-8e663f0e5fabf57065aed1cfdaff5b13057dce23.tar.xz linux-8e663f0e5fabf57065aed1cfdaff5b13057dce23.zip |
NFSv4.1: Fix matching of the stateids when returning a delegation
nfs41_validate_delegation_stateid is broken if we supply a stateid with
a non-zero sequence id. Instead of trying to match the sequence id,
the function assumes that we always want to error. While this is
true for a delegation callback, it is not true in general.
Also fix a typo in nfs4_callback_recall.
Reported-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/delegation.c')
-rw-r--r-- | fs/nfs/delegation.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index ac889af8ccf5..c14512cea798 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -542,7 +542,7 @@ void nfs_expire_unreferenced_delegations(struct nfs_client *clp) /** * nfs_async_inode_return_delegation - asynchronously return a delegation * @inode: inode to process - * @stateid: state ID information from CB_RECALL arguments + * @stateid: state ID information * * Returns zero on success, or a negative errno value. */ |