Commit 6b556ca2 authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields
Browse files

nfsd: have nfsd_test_lock use the nfsd_file cache 



Signed-off-by: default avatarJeff Layton <jeff.layton@primarydata.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 5c4583b2

fs/nfsd/nfs4state.c

+4 −4
Original line number Diff line number Diff line
@@ -6605,11 +6605,11 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
 */

static __be32 nfsd_test_lock(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file_lock *lock)

{

	struct file *file;

	__be32 err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_READ, &file);

	struct nfsd_file *nf;

	__be32 err = nfsd_file_acquire(rqstp, fhp, NFSD_MAY_READ, &nf);

	if (!err) {

		err = nfserrno(vfs_test_lock(file, lock));

		fput(file);

		err = nfserrno(vfs_test_lock(nf->nf_file, lock));

		nfsd_file_put(nf);

	}

	return err;

}