From: Fred Isaman <iisaman@netapp.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH 26/26] pnfs-submit: Reorder arguments to pnfs_update_layout
Date: Fri, 11 Jun 2010 03:31:53 -0400 [thread overview]
Message-ID: <1276241513-17942-27-git-send-email-iisaman@netapp.com> (raw)
In-Reply-To: <1276241513-17942-26-git-send-email-iisaman@netapp.com>
offset and count were switched for some reason.
Signed-off-by: Fred Isaman <iisaman@netapp.com>
---
fs/nfs/file.c | 2 +-
fs/nfs/pnfs.c | 4 ++--
fs/nfs/pnfs.h | 8 ++++----
fs/nfs/read.c | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 409892f..3066141 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -399,7 +399,7 @@ static int nfs_write_begin(struct file *file, struct address_space *mapping,
pnfs_update_layout(mapping->host,
nfs_file_open_context(file),
- NFS4_MAX_UINT64, 0, IOMODE_RW,
+ 0, NFS4_MAX_UINT64, IOMODE_RW,
&lseg);
start:
/*
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index ae76e88..7d322c9 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1053,8 +1053,8 @@ pnfs_has_layout(struct pnfs_layout_type *lo,
void
_pnfs_update_layout(struct inode *ino,
struct nfs_open_context *ctx,
- u64 count,
loff_t pos,
+ u64 count,
enum pnfs_iomode iomode,
struct pnfs_layout_segment **lsegpp)
{
@@ -1371,7 +1371,7 @@ pnfs_pageio_init_read(struct nfs_pageio_descriptor *pgio,
readahead_range(inode, pages, &loff, &count);
if (count > 0) {
- _pnfs_update_layout(inode, ctx, count, loff, IOMODE_READ,
+ _pnfs_update_layout(inode, ctx, loff, count, IOMODE_READ,
&pgio->pg_lseg);
if (!pgio->pg_lseg)
return;
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 541e3fd..75f6cf1 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -33,7 +33,7 @@ extern const nfs4_stateid zero_stateid;
void put_lseg(struct pnfs_layout_segment *lseg);
void _pnfs_update_layout(struct inode *ino, struct nfs_open_context *ctx,
- u64 count, loff_t pos, enum pnfs_iomode access_type,
+ loff_t pos, u64 count, enum pnfs_iomode access_type,
struct pnfs_layout_segment **lsegpp);
int _pnfs_return_layout(struct inode *, struct nfs4_pnfs_layout_segment *,
@@ -172,13 +172,13 @@ static inline int pnfs_return_layout(struct inode *ino,
static inline void pnfs_update_layout(struct inode *ino,
struct nfs_open_context *ctx,
- u64 count, loff_t pos, enum pnfs_iomode access_type,
+ loff_t pos, u64 count, enum pnfs_iomode access_type,
struct pnfs_layout_segment **lsegpp)
{
struct nfs_server *nfss = NFS_SERVER(ino);
if (pnfs_enabled_sb(nfss))
- _pnfs_update_layout(ino, ctx, count, pos, access_type, lsegpp);
+ _pnfs_update_layout(ino, ctx, pos, count, access_type, lsegpp);
else {
if (lsegpp)
*lsegpp = NULL;
@@ -215,7 +215,7 @@ static inline void put_lseg(struct pnfs_layout_segment *lseg)
static inline void
pnfs_update_layout(struct inode *ino, struct nfs_open_context *ctx,
- u64 count, loff_t pos, enum pnfs_iomode access_type,
+ loff_t pos, u64 count, enum pnfs_iomode access_type,
struct pnfs_layout_segment **lsegpp)
{
if (lsegpp)
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 68b4ca8..9cabf88 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -126,7 +126,7 @@ int nfs_readpage_async(struct nfs_open_context *ctx, struct inode *inode,
len = nfs_page_length(page);
if (len == 0)
return nfs_return_empty_page(page);
- pnfs_update_layout(inode, ctx, NFS4_MAX_UINT64, 0, IOMODE_READ, &lseg);
+ pnfs_update_layout(inode, ctx, 0, NFS4_MAX_UINT64, IOMODE_READ, &lseg);
new = nfs_create_request(ctx, inode, page, 0, len, lseg);
put_lseg(lseg);
if (IS_ERR(new)) {
--
1.6.6.1
next prev parent reply other threads:[~2010-06-11 7:32 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-11 7:31 [PATCH 00/26] LAYOUT invocation v2 Fred Isaman
2010-06-11 7:31 ` [PATCH 01/26] pnfs-submit: Revert "pnfs-nonfilelayout: Prelim support for non-file layout O_DIRECT" Fred Isaman
2010-06-11 7:31 ` [PATCH 02/26] pnfs-submit: Revert "pnfs: Enable O_DIRECT write path." Fred Isaman
2010-06-11 7:31 ` [PATCH 03/26] pnfs-submit: Revert "pnfs: Enable O_DIRECT read path." Fred Isaman
2010-06-11 7:31 ` [PATCH 04/26] pnfs-submit: Revert "pnfs: Add function to set up O_DIRECT I/O" Fred Isaman
2010-06-11 7:31 ` [PATCH 05/26] SQUASHME: pnfs-submit: ensure pnfs_update_layout clears lsegp on error Fred Isaman
2010-06-11 7:31 ` [PATCH 06/26] pnfs-submit: filelayout: clean and breakup nfs4_pnfs_dserver_get Fred Isaman
2010-06-11 7:31 ` [PATCH 07/26] pnfs-submit: filelayout: remove some dead code from filelayout_commit Fred Isaman
2010-06-11 7:31 ` [PATCH 08/26] pnfs-submit: remove PNFS_LAYOUTGET_ON_OPEN Fred Isaman
2010-06-11 7:31 ` [PATCH 09/26] pnfs-submit: track the number of outstanding commits Fred Isaman
2010-06-11 7:31 ` [PATCH 10/26] pnfs_submit: mandate basic io path operations for layout drivers Fred Isaman
2010-06-11 7:31 ` [PATCH 11/26] pnfs_submit: expose pnfs_update_layout, put_lseg, and get_lseg functions Fred Isaman
2010-06-11 7:31 ` [PATCH 12/26] pnfs_submit: stash and refcount lseg in read path Fred Isaman
2010-06-11 7:31 ` [PATCH 13/26] pnfs_submit: read path changeover Fred Isaman
2010-06-11 7:31 ` [PATCH 14/26] pnfs_submit: use fsdata to pass lseg Fred Isaman
2010-06-11 7:31 ` [PATCH 15/26] pnfs_submit: stash and refcount lseg in write path Fred Isaman
2010-06-11 7:31 ` [PATCH 16/26] pnfs_submit: remove pnfs_file_operations Fred Isaman
2010-06-11 7:31 ` [PATCH 17/26] pnfs_submit: remove pnfs_update_layout_commit Fred Isaman
2010-06-11 7:31 ` [PATCH 18/26] pnfs_submit: remove pnfs_writepages LAYOUTGET invocation Fred Isaman
2010-06-11 7:31 ` [PATCH 19/26] pnfs-submit: export some commit error handling for use by layout drivers Fred Isaman
2010-06-11 7:31 ` [PATCH 20/26] pnfs_submit: API change: remove pnfs_commit layoutget invocation Fred Isaman
2010-06-11 7:31 ` [PATCH 21/26] pnfs_submit: filelayout: rewrite filelayout_commit to use new API Fred Isaman
2010-06-11 7:31 ` [PATCH 22/26] pnfs_submit: remove unecessary pnfs_fl_call_data field pnfs_client Fred Isaman
2010-06-11 7:31 ` [PATCH 23/26] pnfs_submit: remove unecessary pnfs_fl_call_data field commit_through_mds Fred Isaman
2010-06-11 7:31 ` [PATCH 24/26] pnfs_submit: pnfs_update_layout can return void Fred Isaman
2010-06-11 7:31 ` [PATCH 25/26] pnfs-submit: Revert "pnfs: pnfs_redirty_request" Fred Isaman
2010-06-11 7:31 ` Fred Isaman [this message]
2010-06-12 20:35 ` [PATCH 00/26] LAYOUT invocation v2 Benny Halevy
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=1276241513-17942-27-git-send-email-iisaman@netapp.com \
--to=iisaman@netapp.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