Commit f4d84c52 authored by Chuck Lever's avatar Chuck Lever
Browse files

NFSD: Clean up nfsd_open_verified() 



Its only caller always passes S_IFREG as the @type parameter. As an
additional clean-up, add a kerneldoc comment.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 1c388f27

fs/nfsd/filecache.c

+2 −2
Original line number Diff line number Diff line
@@ -995,8 +995,8 @@ nfsd_file_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp, 


	nf->nf_mark = nfsd_file_mark_find_or_create(nf);

	if (nf->nf_mark)

		status = nfsd_open_verified(rqstp, fhp, S_IFREG,

				may_flags, &nf->nf_file);

		status = nfsd_open_verified(rqstp, fhp, may_flags,

					    &nf->nf_file);

	else

		status = nfserr_jukebox;

	/*

fs/nfsd/vfs.c

+12 −3
Original line number Diff line number Diff line
@@ -827,14 +827,23 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, 
	return err;

}



/**

 * nfsd_open_verified - Open a regular file for the filecache

 * @rqstp: RPC request

 * @fhp: NFS filehandle of the file to open

 * @may_flags: internal permission flags

 * @filp: OUT: open "struct file *"

 *

 * Returns an nfsstat value in network byte order.

 */

__be32

nfsd_open_verified(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type,

		int may_flags, struct file **filp)

nfsd_open_verified(struct svc_rqst *rqstp, struct svc_fh *fhp, int may_flags,

		   struct file **filp)

{

	__be32 err;



	validate_process_creds();

	err = __nfsd_open(rqstp, fhp, type, may_flags, filp);

	err = __nfsd_open(rqstp, fhp, S_IFREG, may_flags, filp);

	validate_process_creds();

	return err;

}

fs/nfsd/vfs.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ __be32 nfsd_setxattr(struct svc_rqst *rqstp, struct svc_fh *fhp, 
int 		nfsd_open_break_lease(struct inode *, int);

__be32		nfsd_open(struct svc_rqst *, struct svc_fh *, umode_t,

				int, struct file **);

__be32		nfsd_open_verified(struct svc_rqst *, struct svc_fh *, umode_t,

__be32		nfsd_open_verified(struct svc_rqst *, struct svc_fh *,

				int, struct file **);

__be32		nfsd_splice_read(struct svc_rqst *rqstp, struct svc_fh *fhp,

				struct file *file, loff_t offset,