Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NFSD: drop fname and flen args from nfsd_create_locked()

Browse source 
[ Upstream commit 9558f9304ca1903090fa5d995a3269a8e82804b4 ]

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

Signed-off-by: NeilBrown <neilb@suse.de>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
NeilBrown 2022-09-06 10:42:19 +10:00 • committed by Ksawlii
parent 0fe5d64021
commit 3568fa858e
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/nfsd/nfsproc.c
View file

@ -391,9 +391,8 @@ nfsd_proc_create(struct svc_rqst *rqstp)
resp->status = nfs_ok; resp->status = nfs_ok;
if (!inode) { if (!inode) {
/* File doesn't exist. Create it and set attrs */ /* File doesn't exist. Create it and set attrs */
resp->status = nfsd_create_locked(rqstp, dirfhp, argp->name, resp->status = nfsd_create_locked(rqstp, dirfhp, &attrs, type,
argp->len, &attrs, type, rdev, rdev, newfhp);
newfhp);
} else if (type == S_IFREG) { } else if (type == S_IFREG) {
dprintk("nfsd: existing %s, valid=%x, size=%ld\n", dprintk("nfsd: existing %s, valid=%x, size=%ld\n",
argp->name, attr->ia_valid, (long) attr->ia_size); argp->name, attr->ia_valid, (long) attr->ia_size);

5
fs/nfsd/vfs.c
View file

@ -1278,7 +1278,7 @@ nfsd_check_ignore_resizing(struct iattr *iap)
/* The parent directory should already be locked: */ /* The parent directory should already be locked: */
__be32 __be32
nfsd_create_locked(struct svc_rqst *rqstp, struct svc_fh *fhp, 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) int type, dev_t rdev, struct svc_fh *resfhp)
{ {
struct dentry *dentry, *dchild; struct dentry *dentry, *dchild;
@ -1411,8 +1411,7 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp,
if (err) if (err)
goto out_unlock; goto out_unlock;
fh_fill_pre_attrs(fhp); fh_fill_pre_attrs(fhp);
err = nfsd_create_locked(rqstp, fhp, fname, flen, attrs, type, err = nfsd_create_locked(rqstp, fhp, attrs, type, rdev, resfhp);
rdev, resfhp);
fh_fill_post_attrs(fhp); fh_fill_post_attrs(fhp);
out_unlock: out_unlock:
inode_unlock(dentry->d_inode); inode_unlock(dentry->d_inode);

4
fs/nfsd/vfs.h
View file

@ -79,8 +79,8 @@ __be32 nfsd4_clone_file_range(struct svc_rqst *rqstp,
u64 count, bool sync); u64 count, bool sync);
#endif /* CONFIG_NFSD_V4 */ #endif /* CONFIG_NFSD_V4 */
__be32 nfsd_create_locked(struct svc_rqst *, struct svc_fh *, __be32 nfsd_create_locked(struct svc_rqst *, struct svc_fh *,
char *name, int len, struct nfsd_attrs *attrs, struct nfsd_attrs *attrs, int type, dev_t rdev,
int type, dev_t rdev, struct svc_fh *res); struct svc_fh *res);
__be32 nfsd_create(struct svc_rqst *, struct svc_fh *, __be32 nfsd_create(struct svc_rqst *, struct svc_fh *,
char *name, int len, struct nfsd_attrs *attrs, char *name, int len, struct nfsd_attrs *attrs,
int type, dev_t rdev, struct svc_fh *res); int type, dev_t rdev, struct svc_fh *res);