From patchwork Mon Aug 20 13:28:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 10570373 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3006D14E1 for ; Mon, 20 Aug 2018 13:28:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20AFE28C57 for ; Mon, 20 Aug 2018 13:28:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1502128E55; Mon, 20 Aug 2018 13:28:12 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 BFB9328C57 for ; Mon, 20 Aug 2018 13:28:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727345AbeHTQns (ORCPT ); Mon, 20 Aug 2018 12:43:48 -0400 Received: from mx2.suse.de ([195.135.220.15]:34670 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726907AbeHTQns (ORCPT ); Mon, 20 Aug 2018 12:43:48 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 6CBBCAEE2 for ; Mon, 20 Aug 2018 13:28:08 +0000 (UTC) From: Nikolay Borisov To: linux-btrfs@vger.kernel.org Cc: Nikolay Borisov Subject: [PATCH 2/2] btrfstune: Rename change_header_uuid to change_buffer_header_uuid Date: Mon, 20 Aug 2018 16:28:05 +0300 Message-Id: <1534771685-4924-3-git-send-email-nborisov@suse.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1534771685-4924-1-git-send-email-nborisov@suse.com> References: <1534771685-4924-1-git-send-email-nborisov@suse.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Rename the function so its name falls in line with the rest of btrfs nomenclature. So when we change the uuid of the header it's in fact of the buffer header. Also remove the root argument since it's used solely to take a reference to fs_info which can be done via the mandatory eb argument. No functional changes. Signed-off-by: Nikolay Borisov Reviewed-by: Qu Wenruo --- btrfstune.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/btrfstune.c b/btrfstune.c index 723317a00f3a..3745a00c46ae 100644 --- a/btrfstune.c +++ b/btrfstune.c @@ -91,9 +91,9 @@ static int set_super_incompat_flags(struct btrfs_root *root, u64 flags) return ret; } -static int change_header_uuid(struct btrfs_root *root, struct extent_buffer *eb) +static int change_buffer_header_uuid(struct extent_buffer *eb) { - struct btrfs_fs_info *fs_info = root->fs_info; + struct btrfs_fs_info *fs_info = eb->fs_info; int same_fsid = 1; int same_chunk_tree_uuid = 1; int ret; @@ -157,7 +157,7 @@ static int change_extents_uuid(struct btrfs_fs_info *fs_info) ret = PTR_ERR(eb); goto out; } - ret = change_header_uuid(root, eb); + ret = change_buffer_header_uuid(eb); free_extent_buffer(eb); if (ret < 0) { error("failed to change uuid of tree block: %llu",