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

Commit 5f7dbd5c authored by Andy Adamson's avatar Andy Adamson Committed by Benny Halevy
Browse files

nfs41: set up seq_res.sr_slotid 



Initialize nfs4_sequence_res sr_slotid to NFS4_MAX_SLOT_TABLE.

[was nfs41: sequence res use slotid]
Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
[pulled definition of struct nfs4_sequence_res.sr_slotid to here]
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent f3752975

fs/nfs/nfs4proc.c

+5 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct path *path, 
	p->o_arg.server = server;

	p->o_arg.bitmask = server->attr_bitmask;

	p->o_arg.claim = NFS4_OPEN_CLAIM_NULL;

	p->o_res.seq_res.sr_slotid = NFS4_MAX_SLOT_TABLE;

	if (flags & O_EXCL) {

		u32 *s = (u32 *) p->o_arg.u.verifier.data;

		s[0] = jiffies;
@@ -1463,6 +1464,7 @@ int nfs4_do_close(struct path *path, struct nfs4_state *state, int wait) 
	calldata->res.fattr = &calldata->fattr;

	calldata->res.seqid = calldata->arg.seqid;

	calldata->res.server = server;

	calldata->res.seq_res.sr_slotid = NFS4_MAX_SLOT_TABLE;

	calldata->path.mnt = mntget(path->mnt);

	calldata->path.dentry = dget(path->dentry);
@@ -3088,6 +3090,7 @@ static int _nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, co 
	memcpy(&data->stateid, stateid, sizeof(data->stateid));

	data->res.fattr = &data->fattr;

	data->res.server = server;

	data->res.seq_res.sr_slotid = NFS4_MAX_SLOT_TABLE;

	nfs_fattr_init(data->res.fattr);

	data->timestamp = jiffies;

	data->rpc_status = 0;
@@ -3240,6 +3243,7 @@ static struct nfs4_unlockdata *nfs4_alloc_unlockdata(struct file_lock *fl, 
	p->arg.fl = &p->fl;

	p->arg.seqid = seqid;

	p->res.seqid = seqid;

	p->res.seq_res.sr_slotid = NFS4_MAX_SLOT_TABLE;

	p->arg.stateid = &lsp->ls_stateid;

	p->lsp = lsp;

	atomic_inc(&lsp->ls_count);
@@ -3412,6 +3416,7 @@ static struct nfs4_lockdata *nfs4_alloc_lockdata(struct file_lock *fl, 
	p->arg.lock_owner.clientid = server->nfs_client->cl_clientid;

	p->arg.lock_owner.id = lsp->ls_id.id;

	p->res.lock_seqid = p->arg.lock_seqid;

	p->res.seq_res.sr_slotid = NFS4_MAX_SLOT_TABLE;

	p->lsp = lsp;

	atomic_inc(&lsp->ls_count);

	p->ctx = get_nfs_open_context(ctx);

fs/nfs/read.c

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ struct nfs_read_data *nfs_readdata_alloc(unsigned int pagecount) 
		memset(p, 0, sizeof(*p));

		INIT_LIST_HEAD(&p->pages);

		p->npages = pagecount;

		p->res.seq_res.sr_slotid = NFS4_MAX_SLOT_TABLE;

		if (pagecount <= ARRAY_SIZE(p->page_array))

			p->pagevec = p->page_array;

		else {

fs/nfs/unlink.c

+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ nfs_async_unlink(struct inode *dir, struct dentry *dentry) 
		status = PTR_ERR(data->cred);

		goto out_free;

	}

	data->res.seq_res.sr_slotid = NFS4_MAX_SLOT_TABLE;



	status = -EBUSY;

	spin_lock(&dentry->d_lock);

fs/nfs/write.c

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ struct nfs_write_data *nfs_commitdata_alloc(void) 
	if (p) {

		memset(p, 0, sizeof(*p));

		INIT_LIST_HEAD(&p->pages);

		p->res.seq_res.sr_slotid = NFS4_MAX_SLOT_TABLE;

	}

	return p;

}
@@ -71,6 +72,7 @@ struct nfs_write_data *nfs_writedata_alloc(unsigned int pagecount) 
		memset(p, 0, sizeof(*p));

		INIT_LIST_HEAD(&p->pages);

		p->npages = pagecount;

		p->res.seq_res.sr_slotid = NFS4_MAX_SLOT_TABLE;

		if (pagecount <= ARRAY_SIZE(p->page_array))

			p->pagevec = p->page_array;

		else {

include/linux/nfs_xdr.h

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ struct nfs4_sequence_args { 


struct nfs4_sequence_res {

	struct nfs4_session	*sr_session;

	u8			sr_slotid;	/* slot used to send request */

};



/*