From patchwork Thu Apr 13 08:05:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9678919 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 073D760381 for ; Thu, 13 Apr 2017 08:06:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EEB5C2861A for ; Thu, 13 Apr 2017 08:06:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E3C6B28642; Thu, 13 Apr 2017 08:06:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 903112861A for ; Thu, 13 Apr 2017 08:06:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754893AbdDMIGE (ORCPT ); Thu, 13 Apr 2017 04:06:04 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:55801 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751471AbdDMIFm (ORCPT ); Thu, 13 Apr 2017 04:05:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=R7hMOFk8TR+X1tPTofvQ//O06/pvaQmwI/nFVvIPAUE=; b=VdggEyV1wDNAG4iPGmbrQMkT9 hAvyWwXTJ02oimvdtItmraE9Q0yAabNsuhSIi1cODZVrKjzaNTsIr9LyNb2fAhdjQ8UTzuwFPyOx0 V4eyHV/3HW38eDCv7ri1h6dqodDT9ACFQtg9jPRlt5/N7VABNh3k0W0mYvLyZe7QrUCl2pNdwKBdS 4EWrf36myT8jQwta0YXCVhtvIgeus8a7Lr48OOJx1o4hb8uURUEvT5sUQEmUO17K5Kbyws0GDtTIq VtvHPB7RuQN1iERlWa29PQVPum7IV4/gLlD42ZKYJIG+CBmZZDUm/NNMFdKcAr1pPXUdKtjkHsaU8 MwTgRQYWQ==; Received: from 212095007060.public.telering.at ([212.95.7.60] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1cyZl7-0007bA-FE for linux-xfs@vger.kernel.org; Thu, 13 Apr 2017 08:05:42 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Subject: [PATCH 05/10] xfs: remove the total argument to xfs_bmap_local_to_extents Date: Thu, 13 Apr 2017 10:05:12 +0200 Message-Id: <20170413080517.12564-6-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170413080517.12564-1-hch@lst.de> References: <20170413080517.12564-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It must inherently be the same as the minlen/maxlen arguments for this allocation. Signed-off-by: Christoph Hellwig Reviewed-by: Brian Foster --- fs/xfs/libxfs/xfs_bmap.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index aec4907056ba..53f1386b1868 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -867,7 +867,6 @@ xfs_bmap_local_to_extents( xfs_trans_t *tp, /* transaction pointer */ xfs_inode_t *ip, /* incore inode pointer */ xfs_fsblock_t *firstblock, /* first block allocated in xaction */ - xfs_extlen_t total, /* total blocks needed by transaction */ int *logflagsp, /* inode logging flags */ int whichfork, void (*init_fn)(struct xfs_trans *tp, @@ -916,8 +915,7 @@ xfs_bmap_local_to_extents( args.fsbno = *firstblock; args.type = XFS_ALLOCTYPE_NEAR_BNO; } - args.total = total; - args.minlen = args.maxlen = args.prod = 1; + args.total = args.minlen = args.maxlen = args.prod = 1; error = xfs_alloc_vextent(&args); if (error) goto done; @@ -1067,7 +1065,7 @@ xfs_bmap_add_attrfork_local( } if (S_ISLNK(VFS_I(ip)->i_mode)) - return xfs_bmap_local_to_extents(tp, ip, firstblock, 1, + return xfs_bmap_local_to_extents(tp, ip, firstblock, flags, XFS_DATA_FORK, xfs_symlink_local_to_remote);