[PATCH] nfsd4: ERR_GRACE should bump seqid on lock

[powerpc.git] / fs / nfsd / nfs4state.c

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 568d5de..92968c9 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -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: