From patchwork Sun May 29 10:30:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boaz Harrosh X-Patchwork-Id: 827442 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 p4TAU8v2023766 for ; Sun, 29 May 2011 10:30:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752571Ab1E2Kaj (ORCPT ); Sun, 29 May 2011 06:30:39 -0400 Received: from daytona.panasas.com ([67.152.220.89]:46008 "EHLO daytona.panasas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752497Ab1E2Kai (ORCPT ); Sun, 29 May 2011 06:30:38 -0400 Received: from fs2.bhalevy.com ([172.17.33.68]) by daytona.panasas.com with Microsoft SMTPSVC(6.0.3790.4675); Sun, 29 May 2011 06:30:37 -0400 From: Boaz Harrosh To: Benny Halevy , Trond Myklebust , NFS list , open-osd Subject: [PATCH 3/8] SQUASHME: objio read/write patch: Bugs fixes Date: Sun, 29 May 2011 13:30:28 +0300 Message-Id: <1306665028-1033-1-git-send-email-bharrosh@panasas.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <4DE21CD5.8070907@panasas.com> References: <4DE21CD5.8070907@panasas.com> X-OriginalArrivalTime: 29 May 2011 10:30:38.0072 (UTC) FILETIME=[73975780:01CC1DEB] Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 29 May 2011 10:30:39 +0000 (UTC) Cap BIO size it one page Signed-off-by: Boaz Harrosh --- fs/nfs/objlayout/objio_osd.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c index 6925567..cc92d3b 100644 --- a/fs/nfs/objlayout/objio_osd.c +++ b/fs/nfs/objlayout/objio_osd.c @@ -397,7 +397,6 @@ int objio_alloc_io_state(struct pnfs_layout_segment *lseg, const unsigned first_size = sizeof(*ios) + objio_seg->num_comps * sizeof(ios->per_dev[0]); - dprintk("%s: num_comps=%d\n", __func__, objio_seg->num_comps); ios = kzalloc(first_size, gfp_flags); if (unlikely(!ios)) return -ENOMEM; @@ -561,6 +560,9 @@ static int _add_stripe_unit(struct objio_state *ios, unsigned *cur_pg, unsigned bio_size = (ios->ol_state.nr_pages + pages_in_stripe) / stripes; + if (BIO_MAX_PAGES_KMALLOC < bio_size) + bio_size = BIO_MAX_PAGES_KMALLOC; + per_dev->bio = bio_kmalloc(gfp_flags, bio_size); if (unlikely(!per_dev->bio)) { dprintk("Faild to allocate BIO size=%u\n", bio_size);