Skip to content

Commit

Permalink
NFSD: File name length signage in nfsd request argument structures
Browse files Browse the repository at this point in the history
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: Chuck Lever <chuck.lever@oracle.com>
Acked-By: NeilBrown <neilb@suse.de>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
  • Loading branch information
Chuck Lever authored and J. Bruce Fields committed Feb 1, 2008
1 parent ee1a95b commit 29d5e55
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions include/linux/nfsd/xdr.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ struct nfsd_sattrargs {
struct nfsd_diropargs {
struct svc_fh fh;
char * name;
int len;
unsigned int len;
};

struct nfsd_readargs {
Expand All @@ -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 {
Expand All @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions include/linux/nfsd/xdr3.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ struct nfsd3_sattrargs {
struct nfsd3_diropargs {
struct svc_fh fh;
char * name;
int len;
unsigned int len;
};

struct nfsd3_accessargs {
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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 {
Expand All @@ -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;
Expand Down

0 comments on commit 29d5e55

Please sign in to comment.