From patchwork Sun Aug 13 14:42:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9897877 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 7AD5E603B4 for ; Sun, 13 Aug 2017 14:43:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6020C1FFD6 for ; Sun, 13 Aug 2017 14:43:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5497027D16; Sun, 13 Aug 2017 14:43:03 +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 F041F205AD for ; Sun, 13 Aug 2017 14:43:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752111AbdHMOm0 (ORCPT ); Sun, 13 Aug 2017 10:42:26 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:52016 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751011AbdHMOmZ (ORCPT ); Sun, 13 Aug 2017 10:42:25 -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=Fb/bGN1wheI3tQGaWjgDj6uSTVCMnwKFPd6UXZ+FgfQ=; b=O9rIusnJrKfr07b8DcNcOmUFg V3xygsWgkceAZy9k7Og6FVrMa47VwcQ0jg1Rj0J5z5VZQDiO4OsfdV42/00Fm5GyzO5L9oztYEXsH hC+X4SpiLSmzZJLvn6BjtN9m/nqrevyKIoHqmEEd78WugLashgsu1yehFYt32aM4o5pyx8H01ed2n mcyhjsYRhfjUuTJg4DNM6YnXvc+GWFG9zU9TLzgQprsaQj5X+uqxejqSzJ5WbHOzH/sO6f85UmpiQ pxbi8prMpIKdxEDAgAFQbfbMB7SOgxkoBSpUjTWokcq/0g0djPAkt4DsDn+nSfP6T4Y6dxbVWYmI1 xFWN45RGg==; Received: from clnet-p099-196.ikbnet.co.at ([83.175.99.196] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dgu5x-0003XK-2A for linux-xfs@vger.kernel.org; Sun, 13 Aug 2017 14:42:25 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Subject: [PATCH 2/3] xfs: rename xfs_defer_join to xfs_defer_join_inode Date: Sun, 13 Aug 2017 16:42:15 +0200 Message-Id: <20170813144216.11192-3-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170813144216.11192-1-hch@lst.de> References: <20170813144216.11192-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 Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Reviewed-by: Darrick J. Wong --- fs/xfs/libxfs/xfs_bmap.c | 2 +- fs/xfs/libxfs/xfs_defer.c | 4 ++-- fs/xfs/libxfs/xfs_defer.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index c09c16b1ad3b..24eba36ef818 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -6452,7 +6452,7 @@ __xfs_bmap_add( bi->bi_whichfork = whichfork; bi->bi_bmap = *bmap; - error = xfs_defer_join(dfops, bi->bi_owner); + error = xfs_defer_join_inode(dfops, bi->bi_owner); if (error) { kmem_free(bi); return error; diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c index 87169bf56a09..043844f00f6e 100644 --- a/fs/xfs/libxfs/xfs_defer.c +++ b/fs/xfs/libxfs/xfs_defer.c @@ -281,7 +281,7 @@ xfs_defer_has_unfinished_work( * to xfs_defer_finish(). */ int -xfs_defer_join( +xfs_defer_join_inode( struct xfs_defer_ops *dop, struct xfs_inode *ip) { @@ -324,7 +324,7 @@ xfs_defer_finish( trace_xfs_defer_finish((*tp)->t_mountp, dop); - xfs_defer_join(dop, ip); + xfs_defer_join_inode(dop, ip); /* Until we run out of pending work to finish... */ while (xfs_defer_has_unfinished_work(dop)) { diff --git a/fs/xfs/libxfs/xfs_defer.h b/fs/xfs/libxfs/xfs_defer.h index f6e93ef0bffe..4632c798ea2b 100644 --- a/fs/xfs/libxfs/xfs_defer.h +++ b/fs/xfs/libxfs/xfs_defer.h @@ -77,7 +77,7 @@ int xfs_defer_finish(struct xfs_trans **tp, struct xfs_defer_ops *dop, void xfs_defer_cancel(struct xfs_defer_ops *dop); void xfs_defer_init(struct xfs_defer_ops *dop, xfs_fsblock_t *fbp); bool xfs_defer_has_unfinished_work(struct xfs_defer_ops *dop); -int xfs_defer_join(struct xfs_defer_ops *dop, struct xfs_inode *ip); +int xfs_defer_join_inode(struct xfs_defer_ops *dop, struct xfs_inode *ip); /* Description of a deferred type. */ struct xfs_defer_op_type {