From 6eec2695ea90953326ec6129cfecb6d9b1a97bca Mon Sep 17 00:00:00 2001 From: Henry C Chang Date: Fri, 17 Dec 2010 09:55:59 -0800 Subject: [PATCH] --- yaml --- r: 223489 b: refs/heads/master c: 361cf40519a491f68b28ad90225e4611c4bf8e12 h: refs/heads/master i: 223487: d7ceef3e66ccc06001b99513a98ccaabe21862a0 v: v3 --- [refs] | 2 +- trunk/net/ceph/pagevec.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 284c092a154d..da1f7c026359 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6aa5901c7a2bd90d0b6b9866300d2648b2568f3 +refs/heads/master: 361cf40519a491f68b28ad90225e4611c4bf8e12 diff --git a/trunk/net/ceph/pagevec.c b/trunk/net/ceph/pagevec.c index 01947a5d03b7..1a040e64c69f 100644 --- a/trunk/net/ceph/pagevec.c +++ b/trunk/net/ceph/pagevec.c @@ -26,12 +26,12 @@ struct page **ceph_get_direct_page_vector(const char __user *data, rc = get_user_pages(current, current->mm, (unsigned long)data, num_pages, write_page, 0, pages, NULL); up_read(¤t->mm->mmap_sem); - if (rc < 0) + if (rc < num_pages) goto fail; return pages; fail: - kfree(pages); + ceph_put_page_vector(pages, rc > 0 ? rc : 0, false); return ERR_PTR(rc); } EXPORT_SYMBOL(ceph_get_direct_page_vector);