From patchwork Sun Apr 3 16:33:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 8734661 Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CCFF19F38C for ; Sun, 3 Apr 2016 16:34:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EB65820212 for ; Sun, 3 Apr 2016 16:34:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 125BE201FA for ; Sun, 3 Apr 2016 16:34:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754131AbcDCQeI (ORCPT ); Sun, 3 Apr 2016 12:34:08 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:34042 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753956AbcDCQeH (ORCPT ); Sun, 3 Apr 2016 12:34:07 -0400 Received: by mail-pa0-f52.google.com with SMTP id fe3so126931167pab.1; Sun, 03 Apr 2016 09:34:06 -0700 (PDT) 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; bh=f8RnSXiS0Ltm1s1Wqzt4C04rE3FJ1OU0KmBxRNLnWV4=; b=PuhnxQ4i2tJsQeaDYEf3ixUhzMoiND3ayFgWED0086yhY2CKUm4YIIV1uld6vTXbzO FTfxTKUG/Z7XxxxPenYtVT7oJ6euUI7LdPWrGLodP3YTfWWWm1iSHRjsCIR+XMBfBDP4 WGguHRR2ynFn/uBxIigkSEueTeo5o+coHJarvjwDdHwhf2NEG5nMOty1D+aMAHcHl+0X Nk2zu0KHDOCT2xSrA9VdanWKGNJncK17yXghmFJR69rcYI4pCFzS2eATOvGaVrObF9/Y HwM06inrW5d7zpOIjv2hC0+CNGvZMkT11W/6SoKmJUAwdAwL4n+j7i6GAQUpzKwJnghg WXNQ== X-Gm-Message-State: AD7BkJKwS0mVfXjNoui1YBhB6H8FqAtLZkuJPjjVoYnc1MMOntaPFQhL5eHKUqFROGTg/g== X-Received: by 10.67.3.67 with SMTP id bu3mr46321741pad.39.1459701245894; Sun, 03 Apr 2016 09:34:05 -0700 (PDT) Received: from localhost (45-125-195-13.ip4.readyserver.sg. [45.125.195.13]) by smtp.gmail.com with ESMTPSA id 19sm33464137pfp.66.2016.04.03.09.34.04 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Sun, 03 Apr 2016 09:34:05 -0700 (PDT) From: Ming Lei To: Jens Axboe , linux-kernel@vger.kernel.org Cc: linux-block@vger.kernel.org, Christoph Hellwig , Al Viro , Anton Altaparmakov , xfs@oss.sgi.com, Dave Chinner , drbd-dev@lists.linbit.com, Philipp Reisner , Lars Ellenberg , Boaz Harrosh , Ming Lei Subject: [PATCH v2 7/8] block: drbd: avoid to use BIO_MAX_SIZE Date: Mon, 4 Apr 2016 00:33:59 +0800 Message-Id: <1459701239-7274-1-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.9.1 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, RCVD_IN_DNSWL_HI, RCVD_IN_SBL, RP_MATCHES_RCVD, 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 drbd is the only user of BIO_MAX_SIZE, so use BIO_MAX_PAGES instead. Reviewed-by: Christoph Hellwig Signed-off-by: Ming Lei --- drivers/block/drbd/drbd_int.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index c227fd4..10bfff1 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -1327,14 +1327,14 @@ struct bm_extent { #endif #endif -/* BIO_MAX_SIZE is 256 * PAGE_CACHE_SIZE, +/* Estimate max bio size as 256 * PAGE_CACHE_SIZE, * so for typical PAGE_CACHE_SIZE of 4k, that is (1<<20) Byte. * Since we may live in a mixed-platform cluster, * we limit us to a platform agnostic constant here for now. * A followup commit may allow even bigger BIO sizes, * once we thought that through. */ #define DRBD_MAX_BIO_SIZE (1U << 20) -#if DRBD_MAX_BIO_SIZE > BIO_MAX_SIZE +#if DRBD_MAX_BIO_SIZE > (BIO_MAX_PAGES << PAGE_CACHE_SHIFT) #error Architecture not supported: DRBD_MAX_BIO_SIZE > BIO_MAX_SIZE #endif #define DRBD_MAX_BIO_SIZE_SAFE (1U << 12) /* Works always = 4k */