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

Commit b37ad28b authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] nfsd: nfs4 code returns error values in net-endian 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Acked-by: default avatarTrond Myklebust <trond.myklebust@fys.uio.no>
Acked-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6264d69d

fs/nfsd/nfs4proc.c

+41 −41
Original line number Diff line number Diff line
@@ -67,10 +67,10 @@ fh_dup2(struct svc_fh *dst, struct svc_fh *src) 
	*dst = *src;

}



static int

static __be32

do_open_permission(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open, int accmode)

{

	int status;

	__be32 status;



	if (open->op_truncate &&

		!(open->op_share_access & NFS4_SHARE_ACCESS_WRITE))
@@ -88,11 +88,11 @@ do_open_permission(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfs 
	return 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 +131,10 @@ do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_o 
	return 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 +161,10 @@ do_open_fhandle(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_ 
}





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 +261,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open 
/*

 * 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 +271,7 @@ nfsd4_getfh(struct svc_fh *current_fh, struct svc_fh **getfh) 
	return 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 +280,10 @@ nfsd4_putfh(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_putf 
	return 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 +291,7 @@ nfsd4_putrootfh(struct svc_rqst *rqstp, struct svc_fh *current_fh) 
	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 +301,7 @@ nfsd4_restorefh(struct svc_fh *current_fh, struct svc_fh *save_fh) 
	return 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 +314,7 @@ nfsd4_savefh(struct svc_fh *current_fh, struct svc_fh *save_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 +324,10 @@ nfsd4_access(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_acc 
	return 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 +339,11 @@ nfsd4_commit(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_com 
	return 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 +423,10 @@ nfsd4_create(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_cre 
	return 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 +442,11 @@ nfsd4_getattr(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_ge 
	return 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 +456,11 @@ nfsd4_link(struct svc_rqst *rqstp, struct svc_fh *current_fh, 
	return 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 +474,16 @@ nfsd4_lookupp(struct svc_rqst *rqstp, struct svc_fh *current_fh) 
	return 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 +508,7 @@ nfsd4_read(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_read 
	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 +531,7 @@ nfsd4_readdir(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_re 
	return 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 +539,10 @@ nfsd4_readlink(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_r 
	return 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 +556,11 @@ nfsd4_remove(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_rem 
	return 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 +589,10 @@ nfsd4_rename(struct svc_rqst *rqstp, struct svc_fh *current_fh, 
	return 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 +614,13 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_se 
	return 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 +661,12 @@ nfsd4_write(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_writ 
 * 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 +741,7 @@ nfsd4_proc_compound(struct svc_rqst *rqstp, 
	struct 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
Original line number Diff line number Diff line
@@ -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, const char *name, int namlen, 
	struct 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, struct dentry *child) 
	int 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, struct dentry *child) 
		printk("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
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ gen_callback(struct nfs4_client *clp, struct nfsd4_setclientid *se) 
 *		as described above.

 *

 */

int

__be32

nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_setclientid *setclid)

{

	u32 			ip_addr = rqstp->rq_addr.sin_addr.s_addr;
@@ -721,7 +721,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_setclientid *setclid) 
	nfs4_verifier		clverifier = setclid->se_verf;

	unsigned int 		strhashval;

	struct nfs4_client	*conf, *unconf, *new;

	int 			status;

	__be32 			status;

	char                    dname[HEXDIR_LEN];

	

	if (!check_name(clname))
@@ -875,14 +875,14 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_setclientid *setclid) 
 *

 * NOTE: callback information will be processed here in a future patch

 */

int

__be32

nfsd4_setclientid_confirm(struct svc_rqst *rqstp, struct nfsd4_setclientid_confirm *setclientid_confirm)

{

	u32 ip_addr = rqstp->rq_addr.sin_addr.s_addr;

	struct nfs4_client *conf, *unconf;

	nfs4_verifier confirm = setclientid_confirm->sc_confirm; 

	clientid_t * clid = &setclientid_confirm->sc_clientid;

	int status;

	__be32 status;



	if (STALE_CLIENTID(clid))

		return nfserr_stale_clientid;
@@ -1280,13 +1280,13 @@ test_share(struct nfs4_stateid *stp, struct nfsd4_open *open) { 
 * Called to check deny when READ with all zero stateid or

 * WRITE with all zero or all one stateid

 */

static int

static __be32

nfs4_share_conflict(struct svc_fh *current_fh, unsigned int deny_type)

{

	struct inode *ino = current_fh->fh_dentry->d_inode;

	struct nfs4_file *fp;

	struct nfs4_stateid *stp;

	int ret;

	__be32 ret;



	dprintk("NFSD: nfs4_share_conflict\n");
@@ -1444,7 +1444,7 @@ static struct lock_manager_operations nfsd_lease_mng_ops = { 
};





int

__be32

nfsd4_process_open1(struct nfsd4_open *open)

{

	clientid_t *clientid = &open->op_clientid;
@@ -1501,7 +1501,7 @@ nfsd4_process_open1(struct nfsd4_open *open) 
	return nfs_ok;

}



static inline int

static inline __be32

nfs4_check_delegmode(struct nfs4_delegation *dp, int flags)

{

	if ((flags & WR_STATE) && (dp->dl_type == NFS4_OPEN_DELEGATE_READ))
@@ -1522,12 +1522,12 @@ find_delegation_file(struct nfs4_file *fp, stateid_t *stid) 
	return NULL;

}



static int

static __be32

nfs4_check_deleg(struct nfs4_file *fp, struct nfsd4_open *open,

		struct nfs4_delegation **dp)

{

	int flags;

	int status = nfserr_bad_stateid;

	__be32 status = nfserr_bad_stateid;



	*dp = find_delegation_file(fp, &open->op_delegate_stateid);

	if (*dp == NULL)
@@ -1546,11 +1546,11 @@ nfs4_check_deleg(struct nfs4_file *fp, struct nfsd4_open *open, 
	return nfs_ok;

}



static int

static __be32

nfs4_check_open(struct nfs4_file *fp, struct nfsd4_open *open, struct nfs4_stateid **stpp)

{

	struct nfs4_stateid *local;

	int status = nfserr_share_denied;

	__be32 status = nfserr_share_denied;

	struct nfs4_stateowner *sop = open->op_stateowner;



	list_for_each_entry(local, &fp->fi_stateids, st_perfile) {
@@ -1575,7 +1575,7 @@ nfs4_alloc_stateid(void) 
	return kmem_cache_alloc(stateid_slab, GFP_KERNEL);

}



static int

static __be32

nfs4_new_open(struct svc_rqst *rqstp, struct nfs4_stateid **stpp,

		struct nfs4_delegation *dp,

		struct svc_fh *cur_fh, int flags)
@@ -1590,7 +1590,7 @@ nfs4_new_open(struct svc_rqst *rqstp, struct nfs4_stateid **stpp, 
		get_file(dp->dl_vfs_file);

		stp->st_vfs_file = dp->dl_vfs_file;

	} else {

		int status;

		__be32 status;

		status = nfsd_open(rqstp, cur_fh, S_IFREG, flags,

				&stp->st_vfs_file);

		if (status) {
@@ -1604,7 +1604,7 @@ nfs4_new_open(struct svc_rqst *rqstp, struct nfs4_stateid **stpp, 
	return 0;

}



static inline int

static inline __be32

nfsd4_truncate(struct svc_rqst *rqstp, struct svc_fh *fh,

		struct nfsd4_open *open)

{
@@ -1619,22 +1619,22 @@ nfsd4_truncate(struct svc_rqst *rqstp, struct svc_fh *fh, 
	return nfsd_setattr(rqstp, fh, &iattr, 0, (time_t)0);

}



static int

static __be32

nfs4_upgrade_open(struct svc_rqst *rqstp, struct svc_fh *cur_fh, struct nfs4_stateid *stp, struct nfsd4_open *open)

{

	struct file *filp = stp->st_vfs_file;

	struct inode *inode = filp->f_dentry->d_inode;

	unsigned int share_access, new_writer;

	int status;

	__be32 status;



	set_access(&share_access, stp->st_access_bmap);

	new_writer = (~share_access) & open->op_share_access

			& NFS4_SHARE_ACCESS_WRITE;



	if (new_writer) {

		status = get_write_access(inode);

		if (status)

			return nfserrno(status);

		int err = get_write_access(inode);

		if (err)

			return nfserrno(err);

	}

	status = nfsd4_truncate(rqstp, cur_fh, open);

	if (status) {
@@ -1738,14 +1738,14 @@ nfs4_open_delegation(struct svc_fh *fh, struct nfsd4_open *open, struct nfs4_sta 
/*

 * called with nfs4_lock_state() held.

 */

int

__be32

nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open)

{

	struct nfs4_file *fp = NULL;

	struct inode *ino = current_fh->fh_dentry->d_inode;

	struct nfs4_stateid *stp = NULL;

	struct nfs4_delegation *dp = NULL;

	int status;

	__be32 status;



	status = nfserr_inval;

	if (!access_valid(open->op_share_access)
@@ -1833,11 +1833,11 @@ static struct work_struct laundromat_work; 
static void laundromat_main(void *);

static DECLARE_WORK(laundromat_work, laundromat_main, NULL);



int 

__be32

nfsd4_renew(clientid_t *clid)

{

	struct nfs4_client *clp;

	int status;

	__be32 status;



	nfs4_lock_state();

	dprintk("process_renew(%08x/%08x): starting\n",
@@ -1996,9 +1996,9 @@ access_permit_write(unsigned long access_bmap) 
}



static

int nfs4_check_openmode(struct nfs4_stateid *stp, int flags)

__be32 nfs4_check_openmode(struct nfs4_stateid *stp, int flags)

{

        int status = nfserr_openmode;

        __be32 status = nfserr_openmode;



	if ((flags & WR_STATE) && (!access_permit_write(stp->st_access_bmap)))

                goto out;
@@ -2009,7 +2009,7 @@ int nfs4_check_openmode(struct nfs4_stateid *stp, int flags) 
	return status;

}



static inline int

static inline __be32

check_special_stateids(svc_fh *current_fh, stateid_t *stateid, int flags)

{

	/* Trying to call delegreturn with a special stateid? Yuch: */
@@ -2043,14 +2043,14 @@ io_during_grace_disallowed(struct inode *inode, int flags) 
/*

* Checks for stateid operations

*/

int

__be32

nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int flags, struct file **filpp)

{

	struct nfs4_stateid *stp = NULL;

	struct nfs4_delegation *dp = NULL;

	stateid_t *stidp;

	struct inode *ino = current_fh->fh_dentry->d_inode;

	int status;

	__be32 status;



	dprintk("NFSD: preprocess_stateid_op: stateid = (%08x/%08x/%08x/%08x)\n",

		stateid->si_boot, stateid->si_stateownerid,
@@ -2125,7 +2125,7 @@ setlkflg (int type) 
/* 

 * Checks for sequence id mutating operations. 

 */

static int

static __be32

nfs4_preprocess_seqid_op(struct svc_fh *current_fh, u32 seqid, stateid_t *stateid, int flags, struct nfs4_stateowner **sopp, struct nfs4_stateid **stpp, struct nfsd4_lock *lock)

{

	struct nfs4_stateid *stp;
@@ -2169,7 +2169,7 @@ nfs4_preprocess_seqid_op(struct svc_fh *current_fh, u32 seqid, stateid_t *statei 
		clientid_t *lockclid = &lock->v.new.clientid;

		struct nfs4_client *clp = sop->so_client;

		int lkflg = 0;

		int status;

		__be32 status;



		lkflg = setlkflg(lock->lk_type);
@@ -2241,10 +2241,10 @@ nfs4_preprocess_seqid_op(struct svc_fh *current_fh, u32 seqid, stateid_t *statei 
	return nfserr_bad_seqid;

}



int

__be32

nfsd4_open_confirm(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open_confirm *oc, struct nfs4_stateowner **replay_owner)

{

	int status;

	__be32 status;

	struct nfs4_stateowner *sop;

	struct nfs4_stateid *stp;
@@ -2310,10 +2310,10 @@ reset_union_bmap_deny(unsigned long deny, unsigned long *bmap) 
	}

}



int

__be32

nfsd4_open_downgrade(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open_downgrade *od, struct nfs4_stateowner **replay_owner)

{

	int status;

	__be32 status;

	struct nfs4_stateid *stp;

	unsigned int share_access;
@@ -2365,10 +2365,10 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct n 
/*

 * nfs4_unlock_state() called after encode

 */

int

__be32

nfsd4_close(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_close *close, struct nfs4_stateowner **replay_owner)

{

	int status;

	__be32 status;

	struct nfs4_stateid *stp;



	dprintk("NFSD: nfsd4_close on file %.*s\n",
@@ -2404,10 +2404,10 @@ nfsd4_close(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_clos 
	return status;

}



int

__be32

nfsd4_delegreturn(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_delegreturn *dr)

{

	int status;

	__be32 status;



	if ((status = fh_verify(rqstp, current_fh, S_IFREG, 0)))

		goto out;
@@ -2635,7 +2635,7 @@ check_lock_length(u64 offset, u64 length) 
/*

 *  LOCK operation 

 */

int

__be32

nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock *lock, struct nfs4_stateowner **replay_owner)

{

	struct nfs4_stateowner *open_sop = NULL;
@@ -2644,7 +2644,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock 
	struct file *filp;

	struct file_lock file_lock;

	struct file_lock conflock;

	int status = 0;

	__be32 status = 0;

	unsigned int strhashval;



	dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n",
@@ -2793,14 +2793,14 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock 
/*

 * LOCKT operation

 */

int

__be32

nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lockt *lockt)

{

	struct inode *inode;

	struct file file;

	struct file_lock file_lock;

	struct file_lock conflock;

	int status;

	__be32 status;



	if (nfs4_in_grace())

		return nfserr_grace;
@@ -2873,13 +2873,13 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock 
	return status;

}



int

__be32

nfsd4_locku(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_locku *locku, struct nfs4_stateowner **replay_owner)

{

	struct nfs4_stateid *stp;

	struct file *filp = NULL;

	struct file_lock file_lock;

	int status;

	__be32 status;

						        

	dprintk("NFSD: nfsd4_locku: start=%Ld length=%Ld\n",

		(long long) locku->lu_offset,
@@ -2965,7 +2965,7 @@ check_for_locks(struct file *filp, struct nfs4_stateowner *lowner) 
	return status;

}



int

__be32

nfsd4_release_lockowner(struct svc_rqst *rqstp, struct nfsd4_release_lockowner *rlockowner)

{

	clientid_t *clid = &rlockowner->rl_clientid;
@@ -2974,7 +2974,7 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp, struct nfsd4_release_lockowner * 
	struct xdr_netobj *owner = &rlockowner->rl_owner;

	struct list_head matches;

	int i;

	int status;

	__be32 status;



	dprintk("nfsd4_release_lockowner clientid: (%08x/%08x):\n",

		clid->cl_boot, clid->cl_id);
@@ -3111,7 +3111,7 @@ nfs4_find_reclaim_client(clientid_t *clid) 
/*

* Called from OPEN. Look for clientid in reclaim list.

*/

int

__be32

nfs4_check_open_reclaim(clientid_t *clid)

{

	return nfs4_find_reclaim_client(clid) ? nfs_ok : nfserr_reclaim_bad;

fs/nfsd/nfs4xdr.c

+75 −75

File changed.

Preview size limit exceeded, changes collapsed.

include/linux/nfsd/state.h

+5 −5
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ update_stateid(stateid_t *stateid) 
 * 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 @@ struct nfs4_stateid { 
	((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);