Commit 9558f930 authored by NeilBrown's avatar NeilBrown Committed by Chuck Lever
Browse files

NFSD: drop fname and flen args from nfsd_create_locked() 



nfsd_create_locked() does not use the "fname" and "flen" arguments, so
drop them from declaration and all callers.

Signed-off-by: default avatarNeilBrown <neilb@suse.de>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent fa6be9cc

fs/nfsd/nfsproc.c

+2 −3
Original line number Diff line number Diff line
@@ -391,9 +391,8 @@ nfsd_proc_create(struct svc_rqst *rqstp) 
	resp->status = nfs_ok;

	if (!inode) {

		/* File doesn't exist. Create it and set attrs */

		resp->status = nfsd_create_locked(rqstp, dirfhp, argp->name,

						  argp->len, &attrs, type, rdev,

						  newfhp);

		resp->status = nfsd_create_locked(rqstp, dirfhp, &attrs, type,

						  rdev, newfhp);

	} else if (type == S_IFREG) {

		dprintk("nfsd:   existing %s, valid=%x, size=%ld\n",

			argp->name, attr->ia_valid, (long) attr->ia_size);

fs/nfsd/vfs.c

+2 −3
Original line number Diff line number Diff line
@@ -1255,7 +1255,7 @@ nfsd_check_ignore_resizing(struct iattr *iap) 
/* The parent directory should already be locked: */

__be32

nfsd_create_locked(struct svc_rqst *rqstp, struct svc_fh *fhp,

		   char *fname, int flen, struct nfsd_attrs *attrs,

		   struct nfsd_attrs *attrs,

		   int type, dev_t rdev, struct svc_fh *resfhp)

{

	struct dentry	*dentry, *dchild;
@@ -1382,8 +1382,7 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, 
	if (err)

		goto out_unlock;

	fh_fill_pre_attrs(fhp);

	err = nfsd_create_locked(rqstp, fhp, fname, flen, attrs, type,

				 rdev, resfhp);

	err = nfsd_create_locked(rqstp, fhp, attrs, type, rdev, resfhp);

	fh_fill_post_attrs(fhp);

out_unlock:

	inode_unlock(dentry->d_inode);

fs/nfsd/vfs.h

+2 −2
Original line number Diff line number Diff line
@@ -79,8 +79,8 @@ __be32 nfsd4_clone_file_range(struct svc_rqst *rqstp, 
				       u64 count, bool sync);

#endif /* CONFIG_NFSD_V4 */

__be32		nfsd_create_locked(struct svc_rqst *, struct svc_fh *,

				char *name, int len, struct nfsd_attrs *attrs,

				int type, dev_t rdev, struct svc_fh *res);

				struct nfsd_attrs *attrs, int type, dev_t rdev,

				struct svc_fh *res);

__be32		nfsd_create(struct svc_rqst *, struct svc_fh *,

				char *name, int len, struct nfsd_attrs *attrs,

				int type, dev_t rdev, struct svc_fh *res);