Commit f9c3e1ba authored by Mike Snitzer's avatar Mike Snitzer Committed by Anna Schumaker
Browse files

nfsd: nfsd_file_acquire_local no longer returns GC'd nfsd_file 



Now that LOCALIO no longer leans on NFSD's filecache for caching open
files (and instead uses NFS client-side open nfsd_file caching) there
is no need to use NFSD filecache's GC feature.  Avoiding GC will speed
up nfsd_file initial opens.

Signed-off-by: default avatarMike Snitzer <snitzer@kernel.org>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Acked-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <anna.schumaker@oracle.com>
parent b33f7dec

fs/nfsd/filecache.c

+4 −5
Original line number Diff line number Diff line
@@ -1222,10 +1222,9 @@ nfsd_file_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp, 
 * a file.  The security implications of this should be carefully

 * considered before use.

 *

 * The nfsd_file object returned by this API is reference-counted

 * and garbage-collected. The object is retained for a few

 * seconds after the final nfsd_file_put() in case the caller

 * wants to re-use it.

 * The nfsd_file_object returned by this API is reference-counted

 * but not garbage-collected. The object is unhashed after the

 * final nfsd_file_put().

 *

 * Return values:

 *   %nfs_ok - @pnf points to an nfsd_file with its reference
@@ -1247,7 +1246,7 @@ nfsd_file_acquire_local(struct net *net, struct svc_cred *cred, 
	__be32 beres;



	beres = nfsd_file_do_acquire(NULL, net, cred, client,

				     fhp, may_flags, NULL, pnf, true);

				     fhp, may_flags, NULL, pnf, false);

	revert_creds(save_cred);

	return beres;

}