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 3/7] SQUASHME pnfs-submit filelayout use new read_pagelist API
Date: Thu, 15 Jul 2010 12:13:50 -0400	[thread overview]
Message-ID: <1279210434-2772-4-git-send-email-andros@netapp.com> (raw)
In-Reply-To: <1279210434-2772-3-git-send-email-andros@netapp.com>

From: Andy Adamson <andros@netapp.com>

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

diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index d60fa1f..45b0dcc 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -199,22 +199,17 @@ struct rpc_call_ops filelayout_write_call_ops = {
  * TODO: join with write_pagelist?
  */
 static enum pnfs_try_status
-filelayout_read_pagelist(struct pnfs_layout_type *layoutid,
-			 struct page **pages,
-			 unsigned int pgbase,
-			 unsigned nr_pages,
-			 loff_t offset,
-			 size_t count,
-			 struct nfs_read_data *data)
+filelayout_read_pagelist(struct nfs_read_data *data, unsigned nr_pages)
 {
-	struct inode *inode = PNFS_INODE(layoutid);
 	struct pnfs_layout_segment *lseg = data->pdata.lseg;
 	struct nfs4_pnfs_ds *ds;
+	loff_t offset = data->args.offset;
 	u32 idx;
 	struct nfs_fh *fh;
 
 	dprintk("--> %s ino %lu nr_pages %d pgbase %u req %Zu@%llu\n",
-		__func__, inode->i_ino, nr_pages, pgbase, count, offset);
+		__func__, data->inode->i_ino, nr_pages,
+		data->args.pgbase, (size_t)data->args.count, offset);
 
 	/* Retrieve the correct rpc_client for the byte range */
 	idx = nfs4_fl_calc_ds_index(lseg, offset);
-- 
1.6.6


  reply	other threads:[~2010-07-15 16:13 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-15 16:13 [PATCH 0/7] pnfs-submit layoutdriver api parameter consolidation andros
2010-07-15 16:13 ` [PATCH 1/7] SQUASHME pnfs-submit fix CONFIG_NFS_V4_1 not set compile error andros
2010-07-15 16:13   ` [PATCH 2/7] SQUASHME pnfs-submit consolidate read_pagelist parameters andros
2010-07-15 16:13     ` andros [this message]
2010-07-15 16:13       ` [PATCH 4/7] SQUASHME pnfs-submit consolidate write_pagelist parameters andros
2010-07-15 16:13         ` [PATCH 5/7] SQUASHME pnfs-submit filelayout use new write_pagelist API andros
2010-07-15 16:13           ` [PATCH 6/7] SQUASHME pnfs-submit consolidate commit parameters andros
2010-07-15 16:13             ` [PATCH 7/7] SQUASHME pnfs-submit filelayout_commit use new API andros
2010-07-20  4:26         ` [PATCH 4/7] SQUASHME pnfs-submit consolidate write_pagelist parameters Benny Halevy
2010-07-20  4:33           ` Benny Halevy
2010-07-20 13:51             ` William A. (Andy) Adamson

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=1279210434-2772-4-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).