NFSD: Remove iattr parameter from nfsd_symlink()

PATCH New Kinglong Mee 1 participant 1 message Jul 1, 2014

Subsystems (2)

NFS client NFS server

lore

Share & tools

lore

Kinglong Mee

author

2014-07-01 09:48 UTC #0 lore raw

PATCH 1/1 NFSD: Remove iattr parameter from nfsd_symlink()

Commit db2e747b1499 (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 Kinglong Mee <[email protected]>

---
 fs/nfsd/nfs3proc.c | 3 +--
 fs/nfsd/nfs4proc.c | 3 +--
 fs/nfsd/nfsproc.c  | 4 +---
 fs/nfsd/vfs.c      | 3 +--
 fs/nfsd/vfs.h      | 2 +-
 5 files changed, 5 insertions(+), 10 deletions(-)

fs/nfsd/nfs3proc.c +1 -2

index f2209aa..6714081 100644
@@ -281,8 +281,7 @@ nfsd3_proc_symlink(struct svc_rqst *rqstp, struct nfsd3_symlinkargs *argp,
 	fh_copy(&resp->dirfh, &argp->ffh);
 	fh_init(&resp->fh, NFS3_FHSIZE);
 	nfserr = nfsd_symlink(rqstp, &resp->dirfh, argp->fname, argp->flen,
-						   argp->tname,
-						   &resp->fh, &argp->attrs);
+						   argp->tname, &resp->fh);
 	RETURN_STATUS(nfserr);
 }

fs/nfsd/nfs4proc.c +1 -2

index e3b7cc9..846fd55 100644
@@ -632,8 +632,7 @@ nfsd4_create(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 	case NF4LNK:
 		status = nfsd_symlink(rqstp, &cstate->current_fh,
 				      create->cr_name, create->cr_namelen,
-				      create->cr_data,
-				      &resfh, &create->cr_iattr);
+				      create->cr_data, &resfh);
 		break;
 
 	case NF4BLK:

fs/nfsd/nfsproc.c +1 -3

index 5343e29..c0fc465 100644
@@ -407,9 +407,7 @@ nfsd_proc_symlink(struct svc_rqst *rqstp, struct nfsd_symlinkargs *argp,
 	 */
 	argp->tname[argp->tlen] = '\0';
 	nfserr = nfsd_symlink(rqstp, &argp->ffh, argp->fname, argp->flen,
-						 argp->tname,
-				 		 &newfh, &argp->attrs);
-
+						 argp->tname, &newfh);
 
 	fh_put(&argp->ffh);
 	fh_put(&newfh);

fs/nfsd/vfs.c +1 -2

index b94c9c5..654adad 100644
@@ -1491,8 +1491,7 @@ __be32
 nfsd_symlink(struct svc_rqst *rqstp, struct svc_fh *fhp,
 				char *fname, int flen,
 				char *path,
-				struct svc_fh *resfhp,
-				struct iattr *iap)
+				struct svc_fh *resfhp)
 {
 	struct dentry	*dentry, *dnew;
 	__be32		err, cerr;

fs/nfsd/vfs.h +1 -1

index 20e4b66..c2ff3f1 100644
@@ -86,7 +86,7 @@ __be32		nfsd_readlink(struct svc_rqst *, struct svc_fh *,
 				char *, int *);
 __be32		nfsd_symlink(struct svc_rqst *, struct svc_fh *,
 				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 *,
 				char *, int, struct svc_fh *);
 __be32		nfsd_rename(struct svc_rqst *,

Signature · 1 line

1.9.3