Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e444f5b authored by Kinglong Mee's avatar Kinglong Mee Committed by J. Bruce Fields
Browse files

NFSD: Remove iattr parameter from nfsd_symlink() 



Commit db2e747b (vfs: remove mode parameter from vfs_symlink())
have remove mode parameter from vfs_symlink.
So that, iattr isn't needed by nfsd_symlink now, just remove it.

Signed-off-by: default avatarKinglong Mee <kinglongmee@gmail.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 950e0118

fs/nfsd/nfs3proc.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -282,8 +282,7 @@ nfsd3_proc_symlink(struct svc_rqst *rqstp, struct nfsd3_symlinkargs *argp, 
	fh_copy(&resp->dirfh, &argp->ffh);

	fh_copy(&resp->dirfh, &argp->ffh);

	fh_init(&resp->fh, NFS3_FHSIZE);

	fh_init(&resp->fh, NFS3_FHSIZE);

	nfserr = nfsd_symlink(rqstp, &resp->dirfh, argp->fname, argp->flen,

	nfserr = nfsd_symlink(rqstp, &resp->dirfh, argp->fname, argp->flen,

						   argp->tname,

						   argp->tname, &resp->fh);

						   &resp->fh, &argp->attrs);

	RETURN_STATUS(nfserr);

	RETURN_STATUS(nfserr);

}

}

fs/nfsd/nfs4proc.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -623,8 +623,7 @@ nfsd4_create(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	case NF4LNK:

	case NF4LNK:

		status = nfsd_symlink(rqstp, &cstate->current_fh,

		status = nfsd_symlink(rqstp, &cstate->current_fh,

				      create->cr_name, create->cr_namelen,

				      create->cr_name, create->cr_namelen,

				      create->cr_data,

				      create->cr_data, &resfh);

				      &resfh, &create->cr_iattr);

		break;

		break;





	case NF4BLK:

	case NF4BLK:

fs/nfsd/nfsproc.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -409,9 +409,7 @@ nfsd_proc_symlink(struct svc_rqst *rqstp, struct nfsd_symlinkargs *argp, 
	 */

	 */

	argp->tname[argp->tlen] = '\0';

	argp->tname[argp->tlen] = '\0';

	nfserr = nfsd_symlink(rqstp, &argp->ffh, argp->fname, argp->flen,

	nfserr = nfsd_symlink(rqstp, &argp->ffh, argp->fname, argp->flen,

						 argp->tname,

						 argp->tname, &newfh);

				 		 &newfh, &argp->attrs);







	fh_put(&argp->ffh);

	fh_put(&argp->ffh);

	fh_put(&newfh);

	fh_put(&newfh);

fs/nfsd/vfs.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1505,8 +1505,7 @@ __be32 
nfsd_symlink(struct svc_rqst *rqstp, struct svc_fh *fhp,

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

				char *fname, int flen,

				char *fname, int flen,

				char *path,

				char *path,

				struct svc_fh *resfhp,

				struct svc_fh *resfhp)

				struct iattr *iap)

{

{

	struct dentry	*dentry, *dnew;

	struct dentry	*dentry, *dnew;

	__be32		err, cerr;

	__be32		err, cerr;

fs/nfsd/vfs.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -86,7 +86,7 @@ __be32 nfsd_readlink(struct svc_rqst *, struct svc_fh *, 
				char *, int *);

				char *, int *);

__be32		nfsd_symlink(struct svc_rqst *, struct svc_fh *,

__be32		nfsd_symlink(struct svc_rqst *, struct svc_fh *,

				char *name, int len, char *path,

				char *name, int len, char *path,

				struct svc_fh *res, struct iattr *);

				struct svc_fh *res);

__be32		nfsd_link(struct svc_rqst *, struct svc_fh *,

__be32		nfsd_link(struct svc_rqst *, struct svc_fh *,

				char *, int, struct svc_fh *);

				char *, int, struct svc_fh *);

__be32		nfsd_rename(struct svc_rqst *,

__be32		nfsd_rename(struct svc_rqst *,