diff options
| author | Henry C Chang <henry_c_chang@tcloudcomputing.com> | 2010-12-16 05:45:41 +0100 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-12-17 18:54:40 +0100 |
| commit | b6aa5901c7a2bd90d0b6b9866300d2648b2568f3 (patch) | |
| tree | 1161ed9dbacb7ace73c5d48fc9acd1db0d7815d5 /net/ceph/pagevec.c | |
| parent | ceph: fix null pointer dereference in ceph_init_dentry for nfs reexport (diff) | |
| download | linux-b6aa5901c7a2bd90d0b6b9866300d2648b2568f3.tar.xz linux-b6aa5901c7a2bd90d0b6b9866300d2648b2568f3.zip | |
ceph: mark user pages dirty on direct-io reads
For read operation, we have to set the argument _write_ of get_user_pages
to 1 since we will write data to pages. Also, we need to SetPageDirty before
releasing these pages.
Signed-off-by: Henry C Chang <henry_c_chang@tcloudcomputing.com>
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to '')
| -rw-r--r-- | net/ceph/pagevec.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/net/ceph/pagevec.c b/net/ceph/pagevec.c index ac34feeb2b3a..01947a5d03b7 100644 --- a/net/ceph/pagevec.c +++ b/net/ceph/pagevec.c @@ -13,7 +13,7 @@ * build a vector of user pages */ struct page **ceph_get_direct_page_vector(const char __user *data, - int num_pages) + int num_pages, bool write_page) { struct page **pages; int rc; @@ -24,7 +24,7 @@ struct page **ceph_get_direct_page_vector(const char __user *data, down_read(¤t->mm->mmap_sem); rc = get_user_pages(current, current->mm, (unsigned long)data, - num_pages, 0, 0, pages, NULL); + num_pages, write_page, 0, pages, NULL); up_read(¤t->mm->mmap_sem); if (rc < 0) goto fail; @@ -36,12 +36,15 @@ fail: } EXPORT_SYMBOL(ceph_get_direct_page_vector); -void ceph_put_page_vector(struct page **pages, int num_pages) +void ceph_put_page_vector(struct page **pages, int num_pages, bool dirty) { int i; - for (i = 0; i < num_pages; i++) + for (i = 0; i < num_pages; i++) { + if (dirty) + set_page_dirty_lock(pages[i]); put_page(pages[i]); + } kfree(pages); } EXPORT_SYMBOL(ceph_put_page_vector); |