From: Jim Rees <rees@umich.edu>
To: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: linux-nfs@vger.kernel.org, peter honeyman <honey@citi.umich.edu>
Subject: [PATCH v5 04/27] pnfs: save layoutcommit cred at layout header
Date: Fri, 29 Jul 2011 11:54:29 -0400 [thread overview]
Message-ID: <1311954892-22038-5-git-send-email-rees@umich.edu> (raw)
In-Reply-To: <1311954892-22038-1-git-send-email-rees@umich.edu>
From: Peng Tao <bergwolf@gmail.com>
No need to save it for every lseg.
Signed-off-by: Peng Tao <peng_tao@emc.com>
---
fs/nfs/pnfs.c | 6 +++---
fs/nfs/pnfs.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 3e0989d..201165e 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1384,7 +1384,7 @@ 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 =
+ nfsi->layout->plh_lc_cred =
get_rpccred(wdata->args.context->state->owner->so_cred);
mark_as_dirty = true;
dprintk("%s: Set layoutcommit for inode %lu ",
@@ -1447,9 +1447,9 @@ 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;
+ cred = nfsi->layout->plh_lc_cred;
nfsi->layout->plh_lwb = 0;
- lseg->pls_lc_cred = NULL;
+ nfsi->layout->plh_lc_cred = NULL;
memcpy(&data->args.stateid.data, nfsi->layout->plh_stateid.data,
sizeof(nfsi->layout->plh_stateid.data));
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 044cb3e..ac86c36 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -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 {
@@ -128,6 +127,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;
};
--
1.7.4.1
next prev parent reply other threads:[~2011-07-29 15:54 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-29 15:54 [PATCH v5 00/27] add block layout driver to pnfs client Jim Rees
2011-07-29 15:54 ` [PATCH v5 01/27] pnfs: GETDEVICELIST Jim Rees
2011-07-29 15:54 ` [PATCH v5 02/27] pnfs: add set-clear layoutdriver interface Jim Rees
2011-07-29 15:54 ` [PATCH v5 03/27] pnfs: save layoutcommit lwb at layout header Jim Rees
2011-07-29 15:54 ` Jim Rees [this message]
2011-07-29 15:54 ` [PATCH v5 05/27] pnfs: let layoutcommit handle a list of lseg Jim Rees
2011-07-29 15:54 ` [PATCH v5 06/27] pnfs: use lwb as layoutcommit length Jim Rees
2011-07-29 15:54 ` [PATCH v5 07/27] NFS41: save layoutcommit cred in layout header init Jim Rees
2011-07-29 15:54 ` [PATCH v5 08/27] pnfs: ask for layout_blksize and save it in nfs_server Jim Rees
2011-07-29 15:54 ` [PATCH v5 09/27] pnfs: cleanup_layoutcommit Jim Rees
2011-07-29 15:54 ` [PATCH v5 10/27] pnfsblock: add blocklayout Kconfig option, Makefile, and stubs Jim Rees
2011-07-29 15:54 ` [PATCH v5 11/27] pnfsblock: use pageio_ops api Jim Rees
2011-07-29 15:54 ` [PATCH v5 12/27] pnfsblock: basic extent code Jim Rees
2011-07-29 15:54 ` [PATCH v5 13/27] pnfsblock: add device operations Jim Rees
2011-07-29 15:54 ` [PATCH v5 14/27] pnfsblock: remove " Jim Rees
2011-07-29 15:54 ` [PATCH v5 15/27] pnfsblock: lseg alloc and free Jim Rees
2011-07-29 15:54 ` [PATCH v5 16/27] pnfsblock: merge extents Jim Rees
2011-07-29 15:54 ` [PATCH v5 17/27] pnfsblock: call and parse getdevicelist Jim Rees
2011-07-29 15:54 ` [PATCH v5 18/27] pnfsblock: xdr decode pnfs_block_layout4 Jim Rees
2011-07-29 15:54 ` [PATCH v5 19/27] pnfsblock: bl_find_get_extent Jim Rees
2011-07-29 15:54 ` [PATCH v5 20/27] pnfsblock: add extent manipulation functions Jim Rees
2011-07-30 1:03 ` Trond Myklebust
2011-07-30 3:23 ` Jim Rees
2011-07-29 15:54 ` [PATCH v5 21/27] pnfsblock: merge rw extents Jim Rees
2011-07-29 15:54 ` [PATCH v5 22/27] pnfsblock: encode_layoutcommit Jim Rees
2011-07-30 1:04 ` Trond Myklebust
2011-07-29 15:54 ` [PATCH v5 23/27] pnfsblock: cleanup_layoutcommit Jim Rees
2011-07-29 15:54 ` [PATCH v5 24/27] pnfsblock: bl_read_pagelist Jim Rees
2011-07-29 15:54 ` [PATCH v5 25/27] pnfsblock: bl_write_pagelist Jim Rees
2011-07-29 15:54 ` [PATCH v5 26/27] pnfsblock: note written INVAL areas for layoutcommit Jim Rees
2011-07-29 15:54 ` [PATCH v5 27/27] pnfsblock: write_pagelist handle zero invalid extents Jim Rees
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1311954892-22038-5-git-send-email-rees@umich.edu \
--to=rees@umich.edu \
--cc=Trond.Myklebust@netapp.com \
--cc=honey@citi.umich.edu \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).