From: Anand jain <Anand.Jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Cc: Anand Jain <anand.jain@oracle.com>
Subject: [PATCH 1/4] Btrfs-progs: introduce btrfs_get_subvols function
Date: Fri, 12 Oct 2012 13:20:51 +0800 [thread overview]
Message-ID: <1350019254-22036-2-git-send-email-Anand.Jain@oracle.com> (raw)
In-Reply-To: <1350019254-22036-1-git-send-email-Anand.Jain@oracle.com>
From: Anand Jain <anand.jain@oracle.com>
Having this not part of btrfs_list_subvols will help
code reuse.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
btrfs-list.c | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/btrfs-list.c b/btrfs-list.c
index 20da828..657e4db 100644
--- a/btrfs-list.c
+++ b/btrfs-list.c
@@ -1323,6 +1323,26 @@ static int __list_subvol_fill_paths(int fd, struct root_lookup *root_lookup)
return 0;
}
+static int btrfs_get_subvols(int fd, struct root_lookup *root_lookup)
+{
+ int ret;
+
+ ret = __list_subvol_search(fd, root_lookup);
+ if (ret) {
+ fprintf(stderr, "ERROR: can't perform the search - %s\n",
+ strerror(errno));
+ return ret;
+ }
+
+ /*
+ * now we have an rbtree full of root_info objects, but we need to fill
+ * in their path names within the subvol that is referencing each one.
+ */
+ ret = __list_subvol_fill_paths(fd, root_lookup);
+
+ return ret;
+}
+
static void print_subvolume_column(struct root_info *subv,
enum btrfs_list_column_enum column)
{
@@ -1471,20 +1491,7 @@ int btrfs_list_subvols(int fd, struct btrfs_list_filter_set *filter_set,
struct root_lookup root_sort;
int ret;
- ret = __list_subvol_search(fd, &root_lookup);
- if (ret) {
- fprintf(stderr, "ERROR: can't perform the search - %s\n",
- strerror(errno));
- return ret;
- }
-
- /*
- * now we have an rbtree full of root_info objects, but we need to fill
- * in their path names within the subvol that is referencing each one.
- */
- ret = __list_subvol_fill_paths(fd, &root_lookup);
- if (ret < 0)
- return ret;
+ ret = btrfs_get_subvols(fd, &root_lookup);
__filter_and_sort_subvol(&root_lookup, &root_sort, filter_set,
comp_set, fd);
--
1.7.1
next prev parent reply other threads:[~2012-10-12 5:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-12 5:20 [PATCH 0/4] Add show sub command to btrfs subvolume Anand jain
2012-10-12 5:20 ` Anand jain [this message]
2012-10-12 5:20 ` [PATCH 2/4] Btrfs-progs: need struct root_info to be accesible Anand jain
2012-10-12 5:20 ` [PATCH 3/4] Btrfs-progs: method to fetch root info for subvol Anand jain
2012-10-12 5:20 ` [PATCH 4/4] Btrfs-progs: add btrfs subvol show cli Anand jain
2012-10-13 20:21 ` Goffredo Baroncelli
2012-10-13 20:11 ` [PATCH 0/4] Add show sub command to btrfs subvolume Goffredo Baroncelli
2012-10-15 9:03 ` Anand Jain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350019254-22036-2-git-send-email-Anand.Jain@oracle.com \
--to=anand.jain@oracle.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).