From patchwork Thu Apr 14 12:02:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 8835251 Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 602B0C0553 for ; Thu, 14 Apr 2016 12:10:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F1564201D3 for ; Thu, 14 Apr 2016 12:10:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2185D20122 for ; Thu, 14 Apr 2016 12:10:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755316AbcDNMKR (ORCPT ); Thu, 14 Apr 2016 08:10:17 -0400 Received: from mail-ob0-f194.google.com ([209.85.214.194]:33220 "EHLO mail-ob0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754913AbcDNMDc (ORCPT ); Thu, 14 Apr 2016 08:03:32 -0400 Received: by mail-ob0-f194.google.com with SMTP id js7so4888943obc.0; Thu, 14 Apr 2016 05:03:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OarADwjuSWQj9qNwGx+I166b5fuVnc1Bq9EP/IsgK84=; b=S3aLLVrNpLJPiiyUEQw41Ps9Pe4Zu+ba6JDfklG+//47e8e/8l0YYg5UZsVZST3P7l QEWhe7HEP9q6tbjwdF80RgWCr9YkDOrFJ+VRA8XEdss2XisbWDTBxRz1va3hxULggxcB YfY8JcdOgAG6mLestVPf+A35vtX8i865iVNdtmyW1AMrXh0r5Km1MJP5riGmSED2RLCq MbEw2n3xYxZk7fDY6xl97hCngf1xSE/teIH5lvYw9ID3mgW3ol5QzzRrspc9TJj7G8A1 z/jsN64Tksi+HWoEkPy8A0jSyi1nTSvu+Y2zBRKB5pWRoHiYK+vAZ315A4kfCi/gJNDP 2prw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OarADwjuSWQj9qNwGx+I166b5fuVnc1Bq9EP/IsgK84=; b=C7/s2MEwjbZFweD/7uG9O+yNwiw07bLgRgp3HyqosK9basS7jPiddl2E3dep9JGGrV 7eswN/gYCe9AnGB9udo6s34KK8ndSU8VIXje/jQgu//I7Hpr7FxIU1CT8Wo0qBmVraR7 lXjuUgLXNypGb7ce/0SJn4gZJEFoD2ct9vZf6m3PcRqct4D7uAGY8b1rTZchpT5xhXXZ BeTeajbVYk1wdHMvJI6R801rtHZvG4B08AJdDDZmzSfdUKj4tLfXaR4oXDUpV1ObXqE4 2EyzPPgEKqKsH4Hf7BEnpSoZ3p/fOzoyrl3IrhshuIKkhmw6UwrVQRPCyi41H6EH9a0i 0baA== X-Gm-Message-State: AOPr4FVm5EP/Ry0zcF8IiEZMwgADBfy0HXcKY8BoslVe1+W7auIEfZwD/Tbq7rD8jAMkNg== X-Received: by 10.60.117.102 with SMTP id kd6mr7333801oeb.73.1460635406938; Thu, 14 Apr 2016 05:03:26 -0700 (PDT) Received: from localhost ([12.228.154.70]) by smtp.gmail.com with ESMTPSA id u202sm13189493oie.29.2016.04.14.05.03.26 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Thu, 14 Apr 2016 05:03:26 -0700 (PDT) From: Ming Lei To: Jens Axboe , linux-kernel@vger.kernel.org Cc: linux-block@vger.kernel.org, Christoph Hellwig , Ming Lei , Oleg Drokin , Andreas Dilger , Greg Kroah-Hartman , Frank Zago , "John L. Hammond" , Mike Rapoport , James Simmons , "Kirill A. Shutemov" , Kent Overstreet , Julia Lawall , lustre-devel@lists.lustre.org (moderated list:STAGING - LUSTRE PARALLEL FILESYSTEM), devel@driverdev.osuosl.org (open list:STAGING SUBSYSTEM) Subject: [PATCH v1 08/27] staging: lustre: avoid to use bio->bi_vcnt directly Date: Thu, 14 Apr 2016 20:02:26 +0800 Message-Id: <1460635375-28282-9-git-send-email-tom.leiming@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1460635375-28282-1-git-send-email-tom.leiming@gmail.com> References: <1460635375-28282-1-git-send-email-tom.leiming@gmail.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Acked-by: Greg Kroah-Hartman Signed-off-by: Ming Lei --- drivers/staging/lustre/lustre/llite/lloop.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/staging/lustre/lustre/llite/lloop.c b/drivers/staging/lustre/lustre/llite/lloop.c index f169c0d..c7bdc2f 100644 --- a/drivers/staging/lustre/lustre/llite/lloop.c +++ b/drivers/staging/lustre/lustre/llite/lloop.c @@ -302,19 +302,20 @@ static unsigned int loop_get_bio(struct lloop_device *lo, struct bio **req) } /* TODO: need to split the bio, too bad. */ - LASSERT(first->bi_vcnt <= LLOOP_MAX_SEGMENTS); + LASSERT(bio_pages(first) <= LLOOP_MAX_SEGMENTS); rw = first->bi_rw; bio = &lo->lo_bio; while (*bio && (*bio)->bi_rw == rw) { + unsigned curr_cnt = bio_pages(*bio); CDEBUG(D_INFO, "bio sector %llu size %u count %u vcnt%u\n", (unsigned long long)(*bio)->bi_iter.bi_sector, (*bio)->bi_iter.bi_size, - page_count, (*bio)->bi_vcnt); - if (page_count + (*bio)->bi_vcnt > LLOOP_MAX_SEGMENTS) + page_count, curr_cnt); + if (page_count + curr_cnt > LLOOP_MAX_SEGMENTS) break; - page_count += (*bio)->bi_vcnt; + page_count += curr_cnt; count++; bio = &(*bio)->bi_next; }