Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0dd395dc authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

[PATCH] nfsd4: ERR_GRACE should bump seqid on lock 



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: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b648330a

fs/nfsd/nfs4state.c

+7 −5
Original line number Diff line number Diff line
@@ -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: