From: Fred Isaman <iisaman@netapp.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH 15/26] pnfs_submit: stash and refcount lseg in write path
Date: Fri, 11 Jun 2010 03:31:42 -0400 [thread overview]
Message-ID: <1276241513-17942-16-git-send-email-iisaman@netapp.com> (raw)
In-Reply-To: <1276241513-17942-15-git-send-email-iisaman@netapp.com>
Store the lseg in each nfs_page. Note this necessitates adding checks
for compatibility with pre-existing nfs_pages lsegs.
Signed-off-by: Fred Isaman <iisaman@netapp.com>
---
fs/nfs/file.c | 10 ++++++----
fs/nfs/write.c | 30 ++++++++++++++++++------------
include/linux/nfs_fs.h | 8 ++++++--
3 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index e308244..184535a 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -442,7 +442,7 @@ start:
}
*pagep = page;
- ret = nfs_flush_incompatible(file, page);
+ ret = nfs_flush_incompatible(file, page, lseg);
if (ret) {
unlock_page(page);
page_cache_release(page);
@@ -496,7 +496,7 @@ static int nfs_write_end(struct file *file, struct address_space *mapping,
zero_user_segment(page, pglen, PAGE_CACHE_SIZE);
}
- status = nfs_updatepage(file, page, offset, copied);
+ status = nfs_updatepage(file, page, offset, copied, lseg);
unlock_page(page);
page_cache_release(page);
@@ -603,6 +603,8 @@ static int nfs_vm_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
/* make sure the cache has finished storing the page */
nfs_fscache_wait_on_page_write(NFS_I(dentry->d_inode), page);
+ /* XXX Do we want to call pnfs_update_layout here? */
+
lock_page(page);
mapping = page->mapping;
if (mapping != dentry->d_inode->i_mapping)
@@ -613,11 +615,11 @@ static int nfs_vm_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
if (pagelen == 0)
goto out_unlock;
- ret = nfs_flush_incompatible(filp, page);
+ ret = nfs_flush_incompatible(filp, page, NULL);
if (ret != 0)
goto out_unlock;
- ret = nfs_updatepage(filp, page, 0, pagelen);
+ ret = nfs_updatepage(filp, page, 0, pagelen, NULL);
out_unlock:
if (!ret)
return VM_FAULT_LOCKED;
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 30f4c09..8a0c845 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -570,7 +570,8 @@ static inline int nfs_scan_commit(struct inode *inode, struct list_head *dst, pg
static struct nfs_page *nfs_try_to_update_request(struct inode *inode,
struct page *page,
unsigned int offset,
- unsigned int bytes)
+ unsigned int bytes,
+ struct pnfs_layout_segment *lseg)
{
struct nfs_page *req;
unsigned int rqend;
@@ -595,8 +596,8 @@ static struct nfs_page *nfs_try_to_update_request(struct inode *inode,
* Note: nfs_flush_incompatible() will already
* have flushed out requests having wrong owners.
*/
- if (offset > rqend
- || end < req->wb_offset)
+ if (offset > rqend || end < req->wb_offset ||
+ req->wb_lseg != lseg)
goto out_flushme;
if (nfs_set_page_tag_locked(req))
@@ -644,16 +645,17 @@ out_err:
* already called nfs_flush_incompatible() if necessary.
*/
static struct nfs_page * nfs_setup_write_request(struct nfs_open_context* ctx,
- struct page *page, unsigned int offset, unsigned int bytes)
+ struct page *page, unsigned int offset, unsigned int bytes,
+ struct pnfs_layout_segment *lseg)
{
struct inode *inode = page->mapping->host;
struct nfs_page *req;
int error;
- req = nfs_try_to_update_request(inode, page, offset, bytes);
+ req = nfs_try_to_update_request(inode, page, offset, bytes, lseg);
if (req != NULL)
goto out;
- req = nfs_create_request(ctx, inode, page, offset, bytes, NULL);
+ req = nfs_create_request(ctx, inode, page, offset, bytes, lseg);
if (IS_ERR(req))
goto out;
error = nfs_inode_add_request(inode, req);
@@ -666,11 +668,12 @@ out:
}
static int nfs_writepage_setup(struct nfs_open_context *ctx, struct page *page,
- unsigned int offset, unsigned int count)
+ unsigned int offset, unsigned int count,
+ struct pnfs_layout_segment *lseg)
{
struct nfs_page *req;
- req = nfs_setup_write_request(ctx, page, offset, count);
+ req = nfs_setup_write_request(ctx, page, offset, count, lseg);
if (IS_ERR(req))
return PTR_ERR(req);
nfs_mark_request_dirty(req);
@@ -682,7 +685,8 @@ static int nfs_writepage_setup(struct nfs_open_context *ctx, struct page *page,
return 0;
}
-int nfs_flush_incompatible(struct file *file, struct page *page)
+int nfs_flush_incompatible(struct file *file, struct page *page,
+ struct pnfs_layout_segment *lseg)
{
struct nfs_open_context *ctx = nfs_file_open_context(file);
struct nfs_page *req;
@@ -699,7 +703,8 @@ int nfs_flush_incompatible(struct file *file, struct page *page)
req = nfs_page_find_request(page);
if (req == NULL)
return 0;
- do_flush = req->wb_page != page || req->wb_context != ctx;
+ do_flush = req->wb_page != page || req->wb_context != ctx ||
+ req->wb_lseg != lseg;
nfs_release_request(req);
if (!do_flush)
return 0;
@@ -726,7 +731,8 @@ static int nfs_write_pageuptodate(struct page *page, struct inode *inode)
* things with a page scheduled for an RPC call (e.g. invalidate it).
*/
int nfs_updatepage(struct file *file, struct page *page,
- unsigned int offset, unsigned int count)
+ unsigned int offset, unsigned int count,
+ struct pnfs_layout_segment *lseg)
{
struct nfs_open_context *ctx = nfs_file_open_context(file);
struct inode *inode = page->mapping->host;
@@ -751,7 +757,7 @@ int nfs_updatepage(struct file *file, struct page *page,
offset = 0;
}
- status = nfs_writepage_setup(ctx, page, offset, count);
+ status = nfs_writepage_setup(ctx, page, offset, count, lseg);
if (status < 0)
nfs_set_pageerror(page);
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index ee45eac..0de7847 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -512,8 +512,12 @@ extern void nfs_unblock_sillyrename(struct dentry *dentry);
extern int nfs_congestion_kb;
extern int nfs_writepage(struct page *page, struct writeback_control *wbc);
extern int nfs_writepages(struct address_space *, struct writeback_control *);
-extern int nfs_flush_incompatible(struct file *file, struct page *page);
-extern int nfs_updatepage(struct file *, struct page *, unsigned int, unsigned int);
+struct pnfs_layout_segment;
+extern int nfs_flush_incompatible(struct file *file, struct page *page,
+ struct pnfs_layout_segment *lseg);
+extern int nfs_updatepage(struct file *, struct page *,
+ unsigned int offset, unsigned int count,
+ struct pnfs_layout_segment *lseg);
extern int nfs_writeback_done(struct rpc_task *, struct nfs_write_data *);
/*
--
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 ` Fred Isaman [this message]
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 ` [PATCH 26/26] pnfs-submit: Reorder arguments to pnfs_update_layout Fred Isaman
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-16-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