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

Commit 9fa40758 authored by Peng Tao's avatar Peng Tao Committed by Trond Myklebust
Browse files

pnfs: save layoutcommit cred at layout header init 



No need to save it for every lseg.
No need to save it at every pnfs_set_layoutcommit.

[Needed in v3.0]
CC: Stable Tree <stable@kernel.org>
Signed-off-by: default avatarPeng Tao <peng_tao@emc.com>
Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
Signed-off-by: default avatarJim Rees <rees@umich.edu>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent acff5880

fs/nfs/pnfs.c

+11 −10
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ static void 
pnfs_free_layout_hdr(struct pnfs_layout_hdr *lo)

{

	struct pnfs_layoutdriver_type *ld = NFS_SERVER(lo->plh_inode)->pnfs_curr_ld;

	put_rpccred(lo->plh_lc_cred);

	return ld->alloc_layout_hdr ? ld->free_layout_hdr(lo) : kfree(lo);

}
@@ -816,7 +817,9 @@ out: 
}



static struct pnfs_layout_hdr *

alloc_init_layout_hdr(struct inode *ino, gfp_t gfp_flags)

alloc_init_layout_hdr(struct inode *ino,

		      struct nfs_open_context *ctx,

		      gfp_t gfp_flags)

{

	struct pnfs_layout_hdr *lo;
@@ -828,11 +831,14 @@ alloc_init_layout_hdr(struct inode *ino, gfp_t gfp_flags) 
	INIT_LIST_HEAD(&lo->plh_segs);

	INIT_LIST_HEAD(&lo->plh_bulk_recall);

	lo->plh_inode = ino;

	lo->plh_lc_cred = get_rpccred(ctx->state->owner->so_cred);

	return lo;

}



static struct pnfs_layout_hdr *

pnfs_find_alloc_layout(struct inode *ino, gfp_t gfp_flags)

pnfs_find_alloc_layout(struct inode *ino,

		       struct nfs_open_context *ctx,

		       gfp_t gfp_flags)

{

	struct nfs_inode *nfsi = NFS_I(ino);

	struct pnfs_layout_hdr *new = NULL;
@@ -847,7 +853,7 @@ pnfs_find_alloc_layout(struct inode *ino, gfp_t gfp_flags) 
			return nfsi->layout;

	}

	spin_unlock(&ino->i_lock);

	new = alloc_init_layout_hdr(ino, gfp_flags);

	new = alloc_init_layout_hdr(ino, ctx, gfp_flags);

	spin_lock(&ino->i_lock);



	if (likely(nfsi->layout == NULL))	/* Won the race? */
@@ -940,7 +946,7 @@ pnfs_update_layout(struct inode *ino, 
	if (!pnfs_enabled_sb(NFS_SERVER(ino)))

		return NULL;

	spin_lock(&ino->i_lock);

	lo = pnfs_find_alloc_layout(ino, gfp_flags);

	lo = pnfs_find_alloc_layout(ino, ctx, gfp_flags);

	if (lo == NULL) {

		dprintk("%s ERROR: can't get pnfs_layout_hdr\n", __func__);

		goto out_unlock;
@@ -1373,8 +1379,6 @@ pnfs_set_layoutcommit(struct nfs_write_data *wdata) 
	if (!test_and_set_bit(NFS_INO_LAYOUTCOMMIT, &nfsi->flags)) {

		/* references matched in nfs4_layoutcommit_release */

		get_lseg(wdata->lseg);

		wdata->lseg->pls_lc_cred =

			get_rpccred(wdata->args.context->state->owner->so_cred);

		mark_as_dirty = true;

		dprintk("%s: Set layoutcommit for inode %lu ",

			__func__, wdata->inode->i_ino);
@@ -1406,7 +1410,6 @@ pnfs_layoutcommit_inode(struct inode *inode, bool sync) 
	struct nfs4_layoutcommit_data *data;

	struct nfs_inode *nfsi = NFS_I(inode);

	struct pnfs_layout_segment *lseg;

	struct rpc_cred *cred;

	loff_t end_pos;

	int status = 0;
@@ -1436,9 +1439,7 @@ pnfs_layoutcommit_inode(struct inode *inode, bool sync) 
	lseg = pnfs_list_write_lseg(inode);



	end_pos = nfsi->layout->plh_lwb;

	cred = lseg->pls_lc_cred;

	nfsi->layout->plh_lwb = 0;

	lseg->pls_lc_cred = NULL;



	memcpy(&data->args.stateid.data, nfsi->layout->plh_stateid.data,

		sizeof(nfsi->layout->plh_stateid.data));
@@ -1446,7 +1447,7 @@ pnfs_layoutcommit_inode(struct inode *inode, bool sync) 


	data->args.inode = inode;

	data->lseg = lseg;

	data->cred = cred;

	data->cred = get_rpccred(nfsi->layout->plh_lc_cred);

	nfs_fattr_init(&data->fattr);

	data->args.bitmask = NFS_SERVER(inode)->cache_consistency_bitmask;

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

fs/nfs/pnfs.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ struct pnfs_layout_segment { 
	atomic_t pls_refcount;

	unsigned long pls_flags;

	struct pnfs_layout_hdr *pls_layout;

	struct rpc_cred	*pls_lc_cred; /* LAYOUTCOMMIT credential */

};



enum pnfs_try_status {
@@ -125,6 +124,7 @@ struct pnfs_layout_hdr { 
	u32			plh_barrier; /* ignore lower seqids */

	unsigned long		plh_flags;

	loff_t			plh_lwb; /* last write byte for layoutcommit */

	struct rpc_cred		*plh_lc_cred; /* layoutcommit cred */

	struct inode		*plh_inode;

};