linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: andros@netpp.com
To: bhalevy@panasas.com
Cc: linux-nfs@vger.kernel.org, Andy Adamson <andros@netapp.com>
Subject: [PATCH 4/5] SQUASHME pnfs-submit: rename layoutget 3
Date: Thu, 19 Aug 2010 11:27:56 -0400	[thread overview]
Message-ID: <1282231677-4412-5-git-send-email-andros@netpp.com> (raw)
In-Reply-To: <1282231677-4412-4-git-send-email-andros@netpp.com>

From: Andy Adamson <andros@netapp.com>

squash into pnfs_submit-layout-helper-functions

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

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index f838f2d..f094925 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -530,7 +530,7 @@ send_layoutget(struct inode *ino,
 {
 	int status;
 	struct nfs_server *server = NFS_SERVER(ino);
-	struct nfs4_pnfs_layoutget *lgp;
+	struct nfs4_layoutget *lgp;
 
 	dprintk("--> %s\n", __func__);
 
@@ -564,7 +564,7 @@ send_layoutget(struct inode *ino,
 	}
 
 	/* Retrieve layout information from server */
-	status = pnfs4_proc_layoutget(lgp);
+	status = nfs4_proc_layoutget(lgp);
 
 	dprintk("<-- %s status %d\n", __func__, status);
 	return status;
@@ -1121,7 +1121,7 @@ int
 pnfs_layout_process(struct nfs4_layoutget *lgp)
 {
 	struct pnfs_layout_hdr *lo = NFS_I(lgp->args.inode)->layout;
-	struct nfs4_pnfs_layoutget_res *res = &lgp->res;
+	struct nfs4_layoutget_res *res = &lgp->res;
 	struct pnfs_layout_segment *lseg;
 	struct inode *ino = PNFS_INODE(lo);
 	int status = 0;
-- 
1.6.2.5


  reply	other threads:[~2010-08-19 15:29 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-19 15:27 [PATCH 0/5] rename getdeviceinfo and layoutget proc and xdr andros
2010-08-19 15:27 ` [PATCH 1/5] SQUASHME pnfs_submit: rename getdeviceinfo andros
2010-08-19 15:27   ` [PATCH 2/5] SQUASHME pnfs-submit: rename layoutget 1 andros
2010-08-19 15:27     ` [PATCH 3/5] SQUASHME pnfs-submit rename layoutget 2 andros
2010-08-19 15:27       ` andros [this message]
2010-08-19 15:27         ` [PATCH 5/5] SQUASHME pnfs-submit: rename layoutget 4 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=1282231677-4412-5-git-send-email-andros@netpp.com \
    --to=andros@netpp.com \
    --cc=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).