From patchwork Mon Mar 21 07:21:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 8629871 Return-Path: X-Original-To: patchwork-linux-btrfs@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 5C2E49F8A8 for ; Mon, 21 Mar 2016 07:21:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 82DD620270 for ; Mon, 21 Mar 2016 07:21:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F49320274 for ; Mon, 21 Mar 2016 07:21:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752616AbcCUHVc (ORCPT ); Mon, 21 Mar 2016 03:21:32 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:39019 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752594AbcCUHV0 (ORCPT ); Mon, 21 Mar 2016 03:21:26 -0400 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u2L7LMai030828 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 21 Mar 2016 07:21:22 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0022.oracle.com (8.13.8/8.13.8) with ESMTP id u2L7LMtW027569 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Mon, 21 Mar 2016 07:21:22 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u2L7LMZW029304; Mon, 21 Mar 2016 07:21:22 GMT Received: from arch2.sg.oracle.com (/10.186.101.133) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 21 Mar 2016 00:21:21 -0700 From: Anand Jain To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.cz Subject: [PATCH 6/6] btrfs-progs: rename get_subvol_name() to subvol_minus_mnt() Date: Mon, 21 Mar 2016 15:21:05 +0800 Message-Id: <1458544865-16467-7-git-send-email-anand.jain@oracle.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1458544865-16467-1-git-send-email-anand.jain@oracle.com> References: <1458137673-464-1-git-send-email-anand.jain@oracle.com> <1458544865-16467-1-git-send-email-anand.jain@oracle.com> X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Signed-off-by: Anand Jain --- cmds-send.c | 4 ++-- utils.c | 4 ++-- utils.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmds-send.c b/cmds-send.c index 7605ed94cd64..339475927837 100644 --- a/cmds-send.c +++ b/cmds-send.c @@ -455,7 +455,7 @@ int cmd_send(int argc, char **argv) if (ret < 0) goto out; - ret = get_root_id(&send, get_subvol_name(send.root_path, subvol), + ret = get_root_id(&send, subvol_path_minus_mnt(send.root_path, subvol), &root_id); if (ret < 0) { error("cannot resolve rootid for %s", subvol); @@ -569,7 +569,7 @@ int cmd_send(int argc, char **argv) if (snapshot_parent != NULL) { ret = get_root_id(&send, - get_subvol_name(send.root_path, snapshot_parent), + subvol_path_minus_mnt(send.root_path, snapshot_parent), &parent_root_id); if (ret < 0) { error("could not resolve rootid for %s", snapshot_parent); diff --git a/utils.c b/utils.c index e66314db21ed..965356df15c9 100644 --- a/utils.c +++ b/utils.c @@ -3157,7 +3157,7 @@ int test_issubvolume(const char *path) return (int)stfs.f_type == BTRFS_SUPER_MAGIC; } -char *get_subvol_name(char *mnt, char *full_path) +char *subvol_path_minus_mnt(char *mnt, char *full_path) { int len = strlen(mnt); if (!len) @@ -3203,7 +3203,7 @@ int get_subvol_info(char *fullpath, struct root_info *get_ri) return 1; } ret = 1; - svpath = get_subvol_name(mnt, fullpath); + svpath = subvol_path_minus_mnt(mnt, fullpath); fd = btrfs_open_dir(fullpath, &dirstream1, 1); if (fd < 0) diff --git a/utils.h b/utils.h index 843a1f4faa52..abdd52095854 100644 --- a/utils.h +++ b/utils.h @@ -196,7 +196,7 @@ const char* group_profile_str(u64 flags); int test_minimum_size(const char *file, u32 leafsize); int test_issubvolname(const char *name); int test_issubvolume(const char *path); -char *get_subvol_name(char *mnt, char *full_path); +char *subvol_path_minus_mnt(char *mnt, char *full_path); int get_subvol_info(char *fullpath, struct root_info *get_ri); int test_isdir(const char *path);