linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: andros@netapp.com
To: bhalevy@panasas.com
Cc: linux-nfs@vger.kernel.org, Andy Adamson <andros@netapp.com>
Subject: [PATCH 04/11] SQUASHME pnfs-submit rename pnfs_layout_type 4
Date: Wed, 18 Aug 2010 10:44:11 -0400	[thread overview]
Message-ID: <1282142658-21579-5-git-send-email-andros@netapp.com> (raw)
In-Reply-To: <1282142658-21579-4-git-send-email-andros@netapp.com>

From: Andy Adamson <andros@netapp.com>

squash into pnfs_submit: layoutget

Signed-off-by: Andy Adamson <andros@netapp.com>
---
 fs/nfs/pnfs.c |    2 +-
 fs/nfs/pnfs.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 98f53c2..fdc4028 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -348,7 +348,7 @@ put_layout(struct inode *inode)
 }
 
 void
-pnfs_layout_release(struct pnfs_layout_type *lo,
+pnfs_layout_release(struct pnfs_layout_hdr *lo,
 		    struct nfs4_pnfs_layout_segment *range)
 {
 	struct nfs_inode *nfsi = PNFS_NFS_INODE(lo);
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 7da54fe..e39af4f 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -58,7 +58,7 @@ void pnfs_pageio_init_read(struct nfs_pageio_descriptor *, struct inode *,
 void pnfs_pageio_init_write(struct nfs_pageio_descriptor *, struct inode *);
 void pnfs_get_layout_done(struct nfs4_pnfs_layoutget *, int rpc_status);
 int pnfs_layout_process(struct nfs4_pnfs_layoutget *lgp);
-void pnfs_layout_release(struct pnfs_layout_type *, struct nfs4_pnfs_layout_segment *range);
+void pnfs_layout_release(struct pnfs_layout_hdr *, struct nfs4_pnfs_layout_segment *range);
 void pnfs_set_layout_stateid(struct pnfs_layout_hdr *lo,
 			     const nfs4_stateid *stateid);
 void pnfs_destroy_layout(struct nfs_inode *);
-- 
1.6.2.5


  reply	other threads:[~2010-08-18 14:44 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-18 14:44 [PATCH 0/11] pnfs-submit rename pnfs_layout_type andros
2010-08-18 14:44 ` [PATCH 01/11] SQUASHME pnfs-submit: rename pnfs_layout_type 1 andros
2010-08-18 14:44   ` [PATCH 02/11] SQUASHME pnfs-submit rename pnfs_layout_type 2 andros
2010-08-18 14:44     ` [PATCH 03/11] SQUASHME pnfs-submit rename pnfs_layout_type 3 andros
2010-08-18 14:44       ` andros [this message]
2010-08-18 14:44         ` [PATCH 05/11] SQUASHME pnfs-submit: rename pnfs_layout_type 5 andros
2010-08-18 14:44           ` [PATCH 06/11] SQUASHME pnfs-submit: rename pnfs_layout_type 6 andros
2010-08-18 14:44             ` [PATCH 07/11] SQUASHME pnfs_submit: rename pnfs_layout_type 7 andros
2010-08-18 14:44               ` [PATCH 08/11] SQUASHME pnfs_submit rename pnfs_layout_type 8 andros
2010-08-18 14:44                 ` [PATCH 09/11] SQUASHME pnfs_submit rename pnfs_layout_type 9 andros
2010-08-18 14:44                   ` [PATCH 10/11] SQUASHME pnfs_submit rename pnfs_layout_type 10 andros
2010-08-18 14:44                     ` [PATCH 11/11] SQUASHME pnfs_submit rename pnfs_layout_type 11 andros

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=1282142658-21579-5-git-send-email-andros@netapp.com \
    --to=andros@netapp.com \
    --cc=bhalevy@panasas.com \
    --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).