From patchwork Mon Dec 20 19:15:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sage Weil X-Patchwork-Id: 422141 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBL0RA8w011307 for ; Tue, 21 Dec 2010 00:31:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932913Ab0LTTPh (ORCPT ); Mon, 20 Dec 2010 14:15:37 -0500 Received: from cobra.newdream.net ([66.33.216.30]:41950 "EHLO cobra.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932915Ab0LTTPe (ORCPT ); Mon, 20 Dec 2010 14:15:34 -0500 Received: from localhost.localdomain (ip-66-33-206-8.dreamhost.com [66.33.206.8]) by cobra.newdream.net (Postfix) with ESMTPA id 5A518BC92F; Mon, 20 Dec 2010 11:20:58 -0800 (PST) From: Sage Weil To: ceph-devel@vger.kernel.org Cc: Henry C Chang , Sage Weil Subject: [PATCH 5/5] ceph: handle partial result from get_user_pages Date: Mon, 20 Dec 2010 11:15:31 -0800 Message-Id: <1292872531-18396-6-git-send-email-sage@newdream.net> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1292872531-18396-5-git-send-email-sage@newdream.net> References: <1292872531-18396-1-git-send-email-sage@newdream.net> <1292872531-18396-2-git-send-email-sage@newdream.net> <1292872531-18396-3-git-send-email-sage@newdream.net> <1292872531-18396-4-git-send-email-sage@newdream.net> <1292872531-18396-5-git-send-email-sage@newdream.net> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 21 Dec 2010 00:31:05 +0000 (UTC) diff --git a/net/ceph/pagevec.c b/net/ceph/pagevec.c index 01947a5..1a040e6 100644 --- a/net/ceph/pagevec.c +++ b/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);