]> err.no Git - linux-2.6/commitdiff
[PATCH] nfsd4: ERR_GRACE should bump seqid on lock
authorNeilBrown <neilb@cse.unsw.edu.au>
Fri, 8 Jul 2005 00:59:15 +0000 (17:59 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 8 Jul 2005 01:24:08 +0000 (18:24 -0700)
A GRACE or NOGRACE response to a lock request should also bump the sequence
id.  So we delay the handling of grace period errors till after we've found
the relevant owner.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
fs/nfsd/nfs4state.c

index 568d5deacac07de573fe2d03085b1a6641089838..92968c94c6e6aa79ac19523216a8d9d9f9b1a8ab 100644 (file)
@@ -2706,11 +2706,6 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
                (long long) lock->lk_offset,
                (long long) lock->lk_length);
 
-       if (nfs4_in_grace() && !lock->lk_reclaim)
-               return nfserr_grace;
-       if (!nfs4_in_grace() && lock->lk_reclaim)
-               return nfserr_no_grace;
-
        if (check_lock_length(lock->lk_offset, lock->lk_length))
                 return nfserr_inval;
 
@@ -2785,6 +2780,13 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
                goto out;
        }
 
+       status = nfserr_grace;
+       if (nfs4_in_grace() && !lock->lk_reclaim)
+               goto out;
+       status = nfserr_no_grace;
+       if (!nfs4_in_grace() && lock->lk_reclaim)
+               goto out;
+
        locks_init_lock(&file_lock);
        switch (lock->lk_type) {
                case NFS4_READ_LT: