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

Commit b59e3c0e authored by Neil Brown's avatar Neil Brown Committed by Linus Torvalds
Browse files

[PATCH] nfsd4: fix open seqid incrementing in lock 



In the case of a lock which introduces a new lockowner, the openowner's
sequence id should be incremented, even when the operation fails, if the
error is a sequence-id-mutating error.  The current code fails to do that
in some cases.  Fix this by using the same sequence-id-incrementing
mechanism that all other such operations use.

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f2327d9a

fs/nfsd/nfs4state.c

+15 −13
Original line number Diff line number Diff line
@@ -2629,7 +2629,9 @@ alloc_init_lock_stateowner(unsigned int strhashval, struct nfs4_client *clp, str 
	sop->so_is_open_owner = 0;

	sop->so_id = current_ownerid++;

	sop->so_client = clp;

	sop->so_seqid = lock->lk_new_lock_seqid;

	/* It is the openowner seqid that will be incremented in encode in the

	 * case of new lockowners; so increment the lock seqid manually: */

	sop->so_seqid = lock->lk_new_lock_seqid + 1;

	sop->so_confirmed = 1;

	rp = &sop->so_replay;

	rp->rp_status = NFSERR_SERVERFAULT;
@@ -2684,6 +2686,7 @@ int 
nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock *lock, struct nfs4_stateowner **replay_owner)

{

	struct nfs4_stateowner *open_sop = NULL;

	struct nfs4_stateowner *lock_sop = NULL;

	struct nfs4_stateid *lock_stp;

	struct file *filp;

	struct file_lock file_lock;
@@ -2718,9 +2721,11 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock 
				        lock->lk_new_open_seqid,

		                        &lock->lk_new_open_stateid,

		                        CHECK_FH | OPEN_STATE,

		                        &open_sop, &open_stp, lock);

		                        &lock->lk_stateowner, &open_stp,

					lock);

		if (status)

			goto out;

		open_sop = lock->lk_stateowner;

		/* create lockowner and lock stateid */

		fp = open_stp->st_file;

		strhashval = lock_ownerstr_hashval(fp->fi_inode,
@@ -2730,16 +2735,15 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock 
		 * the same file, or should they just be allowed (and

		 * create new stateids)? */

		status = nfserr_resource;

		if (!(lock->lk_stateowner = alloc_init_lock_stateowner(strhashval, open_sop->so_client, open_stp, lock)))

		lock_sop = alloc_init_lock_stateowner(strhashval,

				open_sop->so_client, open_stp, lock);

		if (lock_sop == NULL)

			goto out;

		if ((lock_stp = alloc_init_lock_stateid(lock->lk_stateowner, 

						fp, open_stp)) == NULL) {

			release_stateowner(lock->lk_stateowner);

			lock->lk_stateowner = NULL;

		lock_stp = alloc_init_lock_stateid(lock_sop, fp, open_stp);

		if (lock_stp == NULL) {

			release_stateowner(lock_sop);

			goto out;

		}

		/* bump the open seqid used to create the lock */

		open_sop->so_seqid++;

	} else {

		/* lock (lock owner + lock stateid) already exists */

		status = nfs4_preprocess_seqid_op(current_fh,
@@ -2749,6 +2753,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock 
				       &lock->lk_stateowner, &lock_stp, lock);

		if (status)

			goto out;

		lock_sop = lock->lk_stateowner;

	}

	/* lock->lk_stateowner and lock_stp have been created or found */

	filp = lock_stp->st_vfs_file;
@@ -2779,7 +2784,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock 
			status = nfserr_inval;

		goto out;

	}

	file_lock.fl_owner = (fl_owner_t) lock->lk_stateowner;

	file_lock.fl_owner = (fl_owner_t)lock_sop;

	file_lock.fl_pid = current->tgid;

	file_lock.fl_file = filp;

	file_lock.fl_flags = FL_POSIX;
@@ -2835,9 +2840,6 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock 
		 * An error encountered after instantiation of the new

		 * stateid has forced us to destroy it.

		 */

		if (!seqid_mutating_err(status))

			open_sop->so_seqid--;



		release_state_owner(lock_stp, LOCK_STATE);

	}

out: