nfsd: nfs4 code returns error values in net-endian
PATCH 20/25 nfsd: nfs4 code returns error values in net-endian
Signed-off-by Al Viro <[email protected]>
--- fs/nfsd/nfs4proc.c | 83 ++++++++++++------------ fs/nfsd/nfs4recover.c | 14 ++-- fs/nfsd/nfs4state.c | 96 ++++++++++++++-------------- fs/nfsd/nfs4xdr.c | 150 ++++++++++++++++++++++---------------------- include/linux/nfsd/state.h | 10 +-- include/linux/nfsd/xdr4.h | 30 ++++----- 6 files changed, 192 insertions(+), 191 deletions(-)
fs/nfsd/nfs4proc.c +42 -41
@@ -67,10 +67,11 @@ fh_dup2(struct svc_fh *dst, struct svc_f *dst = *src; } -static int +static __be32 do_open_permission (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_open *open) { -int accmode, status; +int accmode; +__be32 status;if (open->op_truncate && !(open->op_share_access &NFS4_SHARE_ACCESS_WRITE ))
@@ -88,11 +89,11 @@ do_open_permission(struct svc_rqst *rqstreturn status; } -static int +static __be32 do_open_lookup (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_open *open) {struct svc_fh resfh; -int status; +__be32 status;fh_init (&resfh,NFS4_FHSIZE ); open->op_truncate =0 ;
@@ -131,10 +132,10 @@ do_open_lookup(struct svc_rqst *rqstp, sreturn status; } -static int +static __be32 do_open_fhandle (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_open *open) { -int status; +__be32 status;/* Only reclaims from previously confirmed clients are valid */ if ((status =nfs4_check_open_reclaim (&open->op_clientid)))
@@ -161,10 +162,10 @@ do_open_fhandle(struct svc_rqst *rqstp, } -static inline int +static inline __be32 nfsd4_open (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_open *open,struct nfs4_stateowner **replay_owner) { -int status; +__be32 status;dprintk ("NFSD: nfsd4_open filename %.*s op_stateowner %p\n" , (int )open->op_fname.len, open->op_fname.data, open->op_stateowner);
@@ -261,7 +262,7 @@ out:/* * filehandle-manipulating ops. */ -static inline int +static inline __be32 nfsd4_getfh (struct svc_fh *current_fh,struct svc_fh **getfh) {if (!current_fh->fh_dentry)
@@ -271,7 +272,7 @@ nfsd4_getfh(struct svc_fh *current_fh, sreturn nfs_ok; } -static inline int +static inline __be32 nfsd4_putfh (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_putfh *putfh) {fh_put (current_fh);
@@ -280,10 +281,10 @@ nfsd4_putfh(struct svc_rqst *rqstp, strureturn fh_verify (rqstp, current_fh,0 ,MAY_NOP ); } -static inline int +static inline __be32 nfsd4_putrootfh (struct svc_rqst *rqstp,struct svc_fh *current_fh) { -int status; +__be32 status;fh_put (current_fh); status = exp_pseudoroot(rqstp->rq_client, current_fh,
@@ -291,7 +292,7 @@ nfsd4_putrootfh(struct svc_rqst *rqstp,return status; } -static inline int +static inline __be32 nfsd4_restorefh (struct svc_fh *current_fh,struct svc_fh *save_fh) {if (!save_fh->fh_dentry)
@@ -301,7 +302,7 @@ nfsd4_restorefh(struct svc_fh *current_freturn nfs_ok; } -static inline int +static inline __be32 nfsd4_savefh (struct svc_fh *current_fh,struct svc_fh *save_fh) {if (!current_fh->fh_dentry)
@@ -314,7 +315,7 @@ nfsd4_savefh(struct svc_fh *current_fh,/* * misc nfsv4 ops */ -static inline int +static inline __be32 nfsd4_access (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_access *access) {if (access->ac_req_access & ~NFS3_ACCESS_FULL )
@@ -324,10 +325,10 @@ nfsd4_access(struct svc_rqst *rqstp, strreturn nfsd_access (rqstp, current_fh, &access->ac_resp_access, &access->ac_supported); } -static inline int +static inline __be32 nfsd4_commit (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_commit *commit) { -int status; +__be32 status;u32 *p = (u32 *)commit->co_verf.data; *p++ = nfssvc_boot.tv_sec;
@@ -339,11 +340,11 @@ nfsd4_commit(struct svc_rqst *rqstp, strreturn status; } -static int +static __be32 nfsd4_create (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_create *create) {struct svc_fh resfh; -int status; +__be32 status;dev_t rdev;fh_init (&resfh,NFS4_FHSIZE );
@@ -423,10 +424,10 @@ nfsd4_create(struct svc_rqst *rqstp, strreturn status; } -static inline int +static inline __be32 nfsd4_getattr (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_getattr *getattr) { -int status; +__be32 status; status =fh_verify (rqstp, current_fh,0 ,MAY_NOP );if (status)
@@ -442,11 +443,11 @@ nfsd4_getattr(struct svc_rqst *rqstp, streturn nfs_ok; } -static inline int +static inline __be32 nfsd4_link (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct svc_fh *save_fh,struct nfsd4_link *link) { -int status = nfserr_nofilehandle; +__be32 status = nfserr_nofilehandle;if (!save_fh->fh_dentry)return status;
@@ -456,11 +457,11 @@ nfsd4_link(struct svc_rqst *rqstp, strucreturn status; } -static int +static __be32 nfsd4_lookupp(struct svc_rqst *rqstp, struct svc_fh *current_fh) { struct svc_fh tmp_fh; - int ret; + __be32 ret; fh_init(&tmp_fh, NFS4_FHSIZE); if((ret = exp_pseudoroot(rqstp->rq_client, &tmp_fh,
@@ -474,16 +475,16 @@ nfsd4_lookupp(struct svc_rqst *rqstp, streturn nfsd_lookup (rqstp, current_fh,".." ,2 , current_fh); } -static inline int +static inline __be32 nfsd4_lookup (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_lookup *lookup) {return nfsd_lookup (rqstp, current_fh, lookup->lo_name, lookup->lo_len, current_fh); } -static inline int +static inline __be32 nfsd4_read (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_read *read) { -int status; +__be32 status;/* no need to check permission - this will be done in nfsd_read() */
@@ -508,7 +509,7 @@ out:return status; } -static inline int +static inline __be32 nfsd4_readdir (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_readdir *readdir) {u64 cookie = readdir->rd_cookie;
@@ -531,7 +532,7 @@ nfsd4_readdir(struct svc_rqst *rqstp, streturn nfs_ok; } -static inline int +static inline __be32 nfsd4_readlink (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_readlink *readlink) { readlink->rl_rqstp = rqstp;
@@ -539,10 +540,10 @@ nfsd4_readlink(struct svc_rqst *rqstp, sreturn nfs_ok; } -static inline int +static inline __be32 nfsd4_remove (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_remove *remove) { -int status; +__be32 status;if (nfs4_in_grace ())return nfserr_grace;
@@ -556,11 +557,11 @@ nfsd4_remove(struct svc_rqst *rqstp, strreturn status; } -static inline int +static inline __be32 nfsd4_rename (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct svc_fh *save_fh,struct nfsd4_rename *rename) { -int status = nfserr_nofilehandle; +__be32 status = nfserr_nofilehandle;if (!save_fh->fh_dentry)return status;
@@ -589,10 +590,10 @@ nfsd4_rename(struct svc_rqst *rqstp, strreturn status; } -static inline int +static inline __be32 nfsd4_setattr (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_setattr *setattr) { -int status = nfs_ok; +__be32 status = nfs_ok;if (setattr->sa_iattr.ia_valid &ATTR_SIZE ) {nfs4_lock_state ();
@@ -614,13 +615,13 @@ nfsd4_setattr(struct svc_rqst *rqstp, streturn status; } -static inline int +static inline __be32 nfsd4_write (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_write *write) {stateid_t *stateid = &write->wr_stateid;struct file *filp =NULL ;u32 *p; -int status = nfs_ok; +__be32 status = nfs_ok;/* no need to check permission - this will be done in nfsd_write() */
@@ -661,12 +662,12 @@ nfsd4_write(struct svc_rqst *rqstp, stru* attributes matched. VERIFY is implemented by mapping NFSERR_SAME * to NFS_OK after the call; NVERIFY by mapping NFSERR_NOT_SAME to NFS_OK. */ -static int +static __be32 nfsd4_verify (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_verify *verify) {__be32 *buf, *p;int count; -int status; +__be32 status; status =fh_verify (rqstp, current_fh,0 ,MAY_NOP );if (status)
@@ -741,7 +742,7 @@ nfsd4_proc_compound(struct svc_rqst *rqsstruct svc_fh *save_fh =NULL ;struct nfs4_stateowner *replay_owner =NULL ;int slack_space;/* in words, not bytes! */ -int status; +__be32 status; status = nfserr_resource; current_fh =kmalloc (sizeof (*current_fh),GFP_KERNEL );
fs/nfsd/nfs4recover.c +7 -7
@@ -83,13 +83,13 @@ md5_to_hex(char *out, char *md5) *out ='\0' ; } -int +__be32 nfs4_make_rec_clidname (char *dname,struct xdr_netobj *clname) {struct xdr_netobj cksum;struct hash_desc desc;struct scatterlist sg[1 ]; -int status = nfserr_resource; +__be32 status = nfserr_resource;dprintk ("NFSD: nfs4_make_rec_clidname for %.*s\n" , clname->len, clname->data);
@@ -193,7 +193,7 @@ nfsd4_build_dentrylist(void *arg, conststruct dentry_list *child;if (name &&isdotent (name, namlen)) -return nfs_ok; +return 0 ; dentry =lookup_one_len (name, parent, namlen);if (IS_ERR (dentry))return PTR_ERR (dentry);
@@ -333,14 +333,14 @@ purge_old(struct dentry *parent, structint status;if (nfs4_has_reclaimed_state (child->d_name.name)) -return nfs_ok; +return 0 ; status =nfsd4_clear_clid_dir (parent, child);if (status)printk ("failed to remove client recovery directory %s\n" , child->d_name.name);/* Keep trying, success or failure: */ -return nfs_ok; +return 0 ; }void
@@ -365,10 +365,10 @@ load_recdir(struct dentry *parent, strucprintk ("nfsd4: illegal name %s in recovery directory\n" , child->d_name.name);/* Keep trying; maybe the others are OK: */ -return nfs_ok; +return 0 ; }nfs4_client_to_reclaim (child->d_name.name); -return nfs_ok; +return 0 ; }int
fs/nfsd/nfs4state.c +48 -48
340 lines not on this page · raw message
fs/nfsd/nfs4xdr.c +75 -75
559 lines not on this page · raw message
include/linux/nfsd/state.h +5 -5
@@ -164,7 +164,7 @@ #define NFSD4_REPLAY_ISIZE 112* is cached. */ struct nfs4_replay { -u32 rp_status; +__be32 rp_status;unsigned int rp_buflen;char *rp_buf;unsigned intrp_allocated;
@@ -273,19 +273,19 @@ #define seqid_mutating_err(err) ((err) != nfserr_stale_stateid) && \ ((err) != nfserr_bad_stateid)) -extern int nfsd4_renew (clientid_t *clid); -extern int nfs4_preprocess_stateid_op (struct svc_fh *current_fh, +extern __be32 nfsd4_renew (clientid_t *clid); +extern __be32 nfs4_preprocess_stateid_op (struct svc_fh *current_fh,stateid_t *stateid,int flags,struct file **filp);extern void nfs4_lock_state (void );extern void nfs4_unlock_state (void );extern int nfs4_in_grace (void ); -extern int nfs4_check_open_reclaim (clientid_t *clid); +extern __be32 nfs4_check_open_reclaim (clientid_t *clid);extern void put_nfs4_client (struct nfs4_client *clp);extern void nfs4_free_stateowner (struct kref *kref);extern void nfsd4_probe_callback (struct nfs4_client *clp);extern void nfsd4_cb_recall (struct nfs4_delegation *dp);extern void nfs4_put_delegation (struct nfs4_delegation *dp); -extern int nfs4_make_rec_clidname (char *clidname,struct xdr_netobj *clname); +extern __be32 nfs4_make_rec_clidname (char *clidname,struct xdr_netobj *clname);extern void nfsd4_init_recdir (char *recdir_name);extern int nfsd4_recdir_load (void );extern void nfsd4_shutdown_recdir (void );
include/linux/nfsd/xdr4.h +15 -15
@@ -334,7 +334,7 @@ struct nfsd4_write {struct nfsd4_op {int opnum; -int status; +__be32 status;union {struct nfsd4_access access;struct nfsd4_close close;
@@ -426,38 +426,38 @@ int nfs4svc_encode_compoundres(struct sv struct nfsd4_compoundres *);void nfsd4_encode_operation (struct nfsd4_compoundres *,struct nfsd4_op *);void nfsd4_encode_replay (struct nfsd4_compoundres *resp,struct nfsd4_op *op); -int nfsd4_encode_fattr (struct svc_fh *fhp,struct svc_export *exp, -struct dentry *dentry,u32 *buffer,int *countp, +__be32 nfsd4_encode_fattr (struct svc_fh *fhp,struct svc_export *exp, +struct dentry *dentry,__be32 *buffer,int *countp,u32 *bmval,struct svc_rqst *); -extern int nfsd4_setclientid (struct svc_rqst *rqstp, +extern __be32 nfsd4_setclientid (struct svc_rqst *rqstp,struct nfsd4_setclientid *setclid); -extern int nfsd4_setclientid_confirm (struct svc_rqst *rqstp, +extern __be32 nfsd4_setclientid_confirm (struct svc_rqst *rqstp,struct nfsd4_setclientid_confirm *setclientid_confirm); -extern int nfsd4_process_open1 (struct nfsd4_open *open); -extern int nfsd4_process_open2 (struct svc_rqst *rqstp, +extern __be32 nfsd4_process_open1 (struct nfsd4_open *open); +extern __be32 nfsd4_process_open2 (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_open *open); -extern int nfsd4_open_confirm (struct svc_rqst *rqstp, +extern __be32 nfsd4_open_confirm (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_open_confirm *oc,struct nfs4_stateowner **); -extern int nfsd4_close (struct svc_rqst *rqstp,struct svc_fh *current_fh, +extern __be32 nfsd4_close (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_close *close,struct nfs4_stateowner **replay_owner); -extern int nfsd4_open_downgrade (struct svc_rqst *rqstp, +extern __be32 nfsd4_open_downgrade (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_open_downgrade *od,struct nfs4_stateowner **replay_owner); -extern int nfsd4_lock (struct svc_rqst *rqstp,struct svc_fh *current_fh, +extern __be32 nfsd4_lock (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_lock *lock,struct nfs4_stateowner **replay_owner); -extern int nfsd4_lockt (struct svc_rqst *rqstp,struct svc_fh *current_fh, +extern __be32 nfsd4_lockt (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_lockt *lockt); -extern int nfsd4_locku (struct svc_rqst *rqstp,struct svc_fh *current_fh, +extern __be32 nfsd4_locku (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_locku *locku,struct nfs4_stateowner **replay_owner); -extern int +extern __be32 nfsd4_release_lockowner (struct svc_rqst *rqstp,struct nfsd4_release_lockowner *rlockowner);extern void nfsd4_release_compoundargs (struct nfsd4_compoundargs *); -extern int nfsd4_delegreturn (struct svc_rqst *rqstp, +extern __be32 nfsd4_delegreturn (struct svc_rqst *rqstp,struct svc_fh *current_fh,struct nfsd4_delegreturn *dr);#endif
Signature · 1 line
1.4.2.GIT