From patchwork Thu Apr 14 11:47:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 8834701 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 A17D4C0553 for ; Thu, 14 Apr 2016 11:49:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C13202011D for ; Thu, 14 Apr 2016 11:49:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7907D20114 for ; Thu, 14 Apr 2016 11:49:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754780AbcDNLt2 (ORCPT ); Thu, 14 Apr 2016 07:49:28 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:33885 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754239AbcDNLsX (ORCPT ); Thu, 14 Apr 2016 07:48:23 -0400 Received: by mail-oi0-f65.google.com with SMTP id q133so9507286oib.1; Thu, 14 Apr 2016 04:48:23 -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:in-reply-to :references; bh=o5a4nQJYJla8Ewz2tq9Wv8RvSbpo5oKHVJQa30rM4qw=; b=PtrbjtFT0oshQshzpjcRtOQRGwOSTFBwcPyQgvljK8TLMpsa9C1lSB+fCSPp6iTvbN fZ6C88EU+OKnGOO9IsT3ONGHP5+qvw0sAD3LihFqP/LQ/bYL+RcXhslEiVjvtXzX7tK+ gr/oBYw0t/RAQPGeDzXi0tf5wUiRiCDsDaZQd+BSSLIcvb0jjnpeIW7o8YB9rux5ySH5 jFj3zmAMVSsDeppOio9JXSloGHGcvI7dP+ihWcEV/IEhXctjfWpFtBzbeYD76b51kn8z gkXdxyY1LwVgXpKh9i1YBqQBtqoBeyWM6+EcXiHwelM7/dyvDDQPZZQN3y7QZry0yqVf qAPA== X-Gm-Message-State: AOPr4FWBrjLY5c4AsloWOscdWtwaHtl8sC06Q7itk1segwdvPA7E/7XihkhrDfLS1Y110A== X-Received: by 10.157.37.25 with SMTP id k25mr543356otb.135.1460634502916; Thu, 14 Apr 2016 04:48:22 -0700 (PDT) Received: from localhost ([12.228.154.70]) by smtp.gmail.com with ESMTPSA id cc15sm13480025obb.2.2016.04.14.04.48.22 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Thu, 14 Apr 2016 04:48:22 -0700 (PDT) From: Ming Lei To: Jens Axboe , linux-kernel@vger.kernel.org Cc: linux-block@vger.kernel.org, Christoph Hellwig , Al Viro , Ming Lei , Philipp Reisner , Lars Ellenberg , drbd-dev@lists.linbit.com (open list:DRBD DRIVER) Subject: [PATCH v4 7/8] block: drbd: avoid to use BIO_MAX_SIZE Date: Thu, 14 Apr 2016 19:47:00 +0800 Message-Id: <1460634438-26530-8-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1460634438-26530-1-git-send-email-ming.lei@canonical.com> References: <1460634438-26530-1-git-send-email-ming.lei@canonical.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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 7a1cf7e..e6e4b08 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_SIZE, +/* Estimate max bio size as 256 * PAGE_SIZE, * so for typical PAGE_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_SHIFT) #error Architecture not supported: DRBD_MAX_BIO_SIZE > BIO_MAX_SIZE #endif #define DRBD_MAX_BIO_SIZE_SAFE (1U << 12) /* Works always = 4k */