---

yaml --- r: 223489 b: refs/heads/master c: 361cf40 h: refs/heads/master i: 223487: d7ceef3 v: v3
git-mirror · Dec 17, 2010 · 6eec269 · 6eec269
1 parent dcff2d1
commit 6eec269
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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(&current->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);