From patchwork Tue Mar 22 06:12: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: 8638061 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 B514E9F6E1 for ; Tue, 22 Mar 2016 06:13:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F27822038A for ; Tue, 22 Mar 2016 06:13:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E3FD2034B for ; Tue, 22 Mar 2016 06:13:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752956AbcCVGNB (ORCPT ); Tue, 22 Mar 2016 02:13:01 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:36212 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752733AbcCVGM6 (ORCPT ); Tue, 22 Mar 2016 02:12:58 -0400 Received: by mail-pf0-f196.google.com with SMTP id q129so34518669pfb.3; Mon, 21 Mar 2016 23:12:58 -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=4YK/YD4qFMw5mKW50lYzYBUxPVa1T9Hs6+bw/7iE5oE=; b=Av/NE+DqVPdqlp/xKuSD65gLTwjbXO8icpIueOWpczjklEpJGiFruIR0i0EEpDCMlD FCOhwx/ptlqmlvBTPOx51MG4AyyN8ksLuMRhhqgRN/lF0pDDp6Thwf0oA9UeJFrqeRzL p6M1imybrmJtgxBIclr1yhLcavCPMnPRX+4jHJTpVdZy2qottLGj3OUsu8seHKzoA2xP ettdA2IsBOH6KXPKtN3xuu0v0Nni1P6urRjgO8auOwz9tsLJeS/iPCbFW2DaDpwbOx7l ckkpBbJ9H6sBGBpxWsavei/SLzCI3LHh8pOBHdzgEJjeYAZ49E6QKYPgSANyIzoUS9sl mOdA== X-Gm-Message-State: AD7BkJLIYGokyhNM2pBkGDG0ETO8a6ndrHiGVerRa2pitjnV7/IdVa7FX7vWZiXowWi59Q== X-Received: by 10.66.118.7 with SMTP id ki7mr51461881pab.152.1458627178117; Mon, 21 Mar 2016 23:12:58 -0700 (PDT) Received: from localhost ([116.251.212.171]) by smtp.gmail.com with ESMTPSA id x18sm45047580pfi.42.2016.03.21.23.12.56 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Mon, 21 Mar 2016 23:12:57 -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 5/8] fs: xfs: replace BIO_MAX_SECTORS with BIO_MAX_PAGES Date: Tue, 22 Mar 2016 14:12:26 +0800 Message-Id: <1458627149-12988-6-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1458627149-12988-1-git-send-email-ming.lei@canonical.com> References: <1458627149-12988-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=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 BIO_MAX_PAGES is used as maximum count of bvecs, so replace BIO_MAX_SECTORS with BIO_MAX_PAGES since BIO_MAX_SECTORS is to be removed. Signed-off-by: Ming Lei --- fs/xfs/xfs_buf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index 9a2191b..01ef6d2 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c @@ -1161,7 +1161,7 @@ xfs_buf_ioapply_map( next_chunk: atomic_inc(&bp->b_io_remaining); - nr_pages = BIO_MAX_SECTORS >> (PAGE_SHIFT - BBSHIFT); + nr_pages = BIO_MAX_PAGES; if (nr_pages > total_nr_pages) nr_pages = total_nr_pages;