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

Commit 29d5e555 authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

NFSD: File name length signage in nfsd request argument structures 



Clean up: For consistency, store the length of file name strings in nfsd
argument structures as unsigned integers.  This matches the XDR routines
and client argument structures for the same operation types.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Acked-By: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent ee1a95b3

include/linux/nfsd/xdr.h

+6 −6
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ struct nfsd_sattrargs { 
struct nfsd_diropargs {

	struct svc_fh		fh;

	char *			name;

	int			len;

	unsigned int		len;

};



struct nfsd_readargs {
@@ -43,17 +43,17 @@ struct nfsd_writeargs { 
struct nfsd_createargs {

	struct svc_fh		fh;

	char *			name;

	int			len;

	unsigned int		len;

	struct iattr		attrs;

};



struct nfsd_renameargs {

	struct svc_fh		ffh;

	char *			fname;

	int			flen;

	unsigned int		flen;

	struct svc_fh		tfh;

	char *			tname;

	int			tlen;

	unsigned int		tlen;

};



struct nfsd_readlinkargs {
@@ -65,13 +65,13 @@ struct nfsd_linkargs { 
	struct svc_fh		ffh;

	struct svc_fh		tfh;

	char *			tname;

	int			tlen;

	unsigned int		tlen;

};



struct nfsd_symlinkargs {

	struct svc_fh		ffh;

	char *			fname;

	int			flen;

	unsigned int		flen;

	char *			tname;

	int			tlen;

	struct iattr		attrs;

include/linux/nfsd/xdr3.h

+7 −7
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ struct nfsd3_sattrargs { 
struct nfsd3_diropargs {

	struct svc_fh		fh;

	char *			name;

	int			len;

	unsigned int		len;

};



struct nfsd3_accessargs {
@@ -48,7 +48,7 @@ struct nfsd3_writeargs { 
struct nfsd3_createargs {

	struct svc_fh		fh;

	char *			name;

	int			len;

	unsigned int		len;

	int			createmode;

	struct iattr		attrs;

	__be32 *		verf;
@@ -57,7 +57,7 @@ struct nfsd3_createargs { 
struct nfsd3_mknodargs {

	struct svc_fh		fh;

	char *			name;

	int			len;

	unsigned int		len;

	__u32			ftype;

	__u32			major, minor;

	struct iattr		attrs;
@@ -66,10 +66,10 @@ struct nfsd3_mknodargs { 
struct nfsd3_renameargs {

	struct svc_fh		ffh;

	char *			fname;

	int			flen;

	unsigned int		flen;

	struct svc_fh		tfh;

	char *			tname;

	int			tlen;

	unsigned int		tlen;

};



struct nfsd3_readlinkargs {
@@ -81,13 +81,13 @@ struct nfsd3_linkargs { 
	struct svc_fh		ffh;

	struct svc_fh		tfh;

	char *			tname;

	int			tlen;

	unsigned int		tlen;

};



struct nfsd3_symlinkargs {

	struct svc_fh		ffh;

	char *			fname;

	int			flen;

	unsigned int		flen;

	char *			tname;

	int			tlen;

	struct iattr		attrs;