From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org, dsterba@suse.cz, gene@czarc.net
Subject: [PATCH 12/12] Btrfs-progs: update btrfs_get_subvol to be inline with resolve_root ret changes
Date: Tue, 29 Jan 2013 14:49:01 +0800 [thread overview]
Message-ID: <1359442141-25498-13-git-send-email-anand.jain@oracle.com> (raw)
In-Reply-To: <1359442141-25498-1-git-send-email-anand.jain@oracle.com>
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
btrfs-list.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/btrfs-list.c b/btrfs-list.c
index db3665c..0cc368c 100644
--- a/btrfs-list.c
+++ b/btrfs-list.c
@@ -1502,19 +1502,24 @@ int btrfs_list_subvols_print(int fd, struct btrfs_list_filter_set *filter_set,
int btrfs_get_subvol(int fd, struct root_info *the_ri)
{
- int ret = -1;
+ int ret = 1, rr;
struct root_lookup rl;
struct rb_node *rbn;
struct root_info *ri;
u64 root_id = btrfs_list_get_path_rootid(fd);
if (btrfs_list_subvols(fd, &rl))
- return 1;
+ return ret;
rbn = rb_first(&rl.root);
while(rbn) {
ri = rb_entry(rbn, struct root_info, rb_node);
- resolve_root(&rl, ri, root_id);
+ rr = resolve_root(&rl, ri, root_id);
+ if (rr == -ENOENT) {
+ ret = -ENOENT;
+ rbn = rb_next(rbn);
+ continue;
+ }
if (!comp_entry_with_rootid(the_ri, ri, 0)) {
memcpy(the_ri, ri, offsetof(struct root_info, path));
if (ri->path)
--
1.8.1.227.g44fe835
next prev parent reply other threads:[~2013-01-29 6:42 UTC|newest]
Thread overview: 131+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-25 9:19 [PATCH 00/10 V2] add show sub-command for btrfs subvol cli Anand Jain
2013-01-23 8:12 ` [PATCH 00/10] " Anand Jain
2013-01-23 8:12 ` [PATCH 01/10] Btrfs-progs: move open_file_or_dir() to utils.c Anand Jain
2013-01-24 4:39 ` Eric Sandeen
2013-01-24 9:23 ` Stefan Behrens
2013-01-24 17:57 ` Goffredo Baroncelli
2013-01-24 19:42 ` Eric Sandeen
2013-01-24 22:09 ` Goffredo Baroncelli
2013-01-24 22:36 ` Chris Mason
2013-01-24 22:49 ` David Sterba
2013-01-24 22:52 ` Avi Miller
2013-01-25 16:14 ` Eric Sandeen
2013-01-25 16:48 ` Hugo Mills
2013-01-25 18:47 ` Gene Czarcinski
2013-01-28 3:12 ` Anand Jain
2013-01-25 15:19 ` Eric Sandeen
2013-01-25 9:21 ` Anand Jain
2013-01-23 8:12 ` [PATCH 02/10] Btrfs-progs: move printing subvol list outside of btrfs_list_subvols Anand Jain
2013-01-23 8:12 ` [PATCH 03/10] Btrfs-progs: add parent uuid for snapshots Anand Jain
2013-01-23 8:12 ` [PATCH 04/10] Btrfs-progs: move struct root_info to btrfs-list.h Anand Jain
2013-01-23 8:12 ` [PATCH 05/10] Btrfs-progs: add function btrfs_get_subvol to get root_info of a subvol Anand Jain
2013-01-24 4:49 ` Eric Sandeen
2013-01-25 9:20 ` Anand Jain
2013-01-23 8:12 ` [PATCH 06/10] Btrfs-progs: add method to filter snapshots by parent uuid Anand Jain
2013-01-23 8:12 ` [PATCH 07/10] Btrfs-progs: put find_mount_root() in commands.h Anand Jain
2013-01-23 8:12 ` [PATCH 08/10] Btrfs-progs: make printing subvol extensible to newer layouts Anand Jain
2013-01-23 8:12 ` [PATCH 09/10] Btrfs-progs: make get_subvol_name non cmds-send specific Anand Jain
2013-01-23 8:12 ` [PATCH 10/10] Btrfs-progs: add show subcommand to subvol cli Anand Jain
2013-01-24 5:06 ` Eric Sandeen
2013-01-24 19:42 ` Zach Brown
2013-01-24 23:14 ` Chris Mason
2013-01-24 23:24 ` Zach Brown
2013-01-25 9:24 ` Anand Jain
2013-01-23 21:57 ` [PATCH 00/10] add show sub-command for btrfs " Gene Czarcinski
2013-01-24 4:11 ` Anand Jain
2013-01-24 20:52 ` Gene Czarcinski
2013-01-25 9:23 ` Anand Jain
2013-01-25 9:19 ` [PATCH 01/10] Btrfs-progs: move open_file_or_dir() to utils.c Anand Jain
2013-01-25 9:19 ` [PATCH 02/10] Btrfs-progs: move printing subvol list outside of btrfs_list_subvols Anand Jain
2013-01-25 9:19 ` [PATCH 03/10] Btrfs-progs: add parent uuid for snapshots Anand Jain
2013-01-25 9:19 ` [PATCH 04/10] Btrfs-progs: move struct root_info to btrfs-list.h Anand Jain
2013-01-25 9:19 ` [PATCH 05/10] Btrfs-progs: add function btrfs_get_subvol to get root_info of a subvol Anand Jain
2013-01-25 9:19 ` [PATCH 06/10] Btrfs-progs: add method to filter snapshots by parent uuid Anand Jain
2013-01-25 9:19 ` [PATCH 07/10] Btrfs-progs: put find_mount_root() in commands.h Anand Jain
2013-01-25 9:19 ` [PATCH 08/10] Btrfs-progs: make printing subvol extensible to newer layouts Anand Jain
2013-01-25 9:19 ` [PATCH 09/10] Btrfs-progs: make get_subvol_name non cmds-send specific Anand Jain
2013-01-25 9:19 ` [PATCH 10/10] Btrfs-progs: add show subcommand to subvol cli Anand Jain
2013-01-25 9:30 ` [RESEND] [PATCH 00/10 V2] add show sub-command for btrfs " Anand Jain
2013-01-25 9:30 ` [PATCH 01/10] Btrfs-progs: move open_file_or_dir() to utils.c Anand Jain
2013-01-25 9:30 ` [PATCH 02/10] Btrfs-progs: move printing subvol list outside of btrfs_list_subvols Anand Jain
2013-01-25 9:30 ` [PATCH 03/10] Btrfs-progs: add parent uuid for snapshots Anand Jain
2013-01-25 9:30 ` [PATCH 04/10] Btrfs-progs: move struct root_info to btrfs-list.h Anand Jain
2013-01-25 9:30 ` [PATCH 05/10] Btrfs-progs: add function btrfs_get_subvol to get root_info of a subvol Anand Jain
2013-01-25 9:30 ` [PATCH 06/10] Btrfs-progs: add method to filter snapshots by parent uuid Anand Jain
2013-01-25 9:30 ` [PATCH 07/10] Btrfs-progs: put find_mount_root() in commands.h Anand Jain
2013-01-25 9:30 ` [PATCH 08/10] Btrfs-progs: make printing subvol extensible to newer layouts Anand Jain
2013-01-25 9:30 ` [PATCH 09/10] Btrfs-progs: make get_subvol_name non cmds-send specific Anand Jain
2013-01-25 9:30 ` [PATCH 10/10] Btrfs-progs: add show subcommand to subvol cli Anand Jain
2013-01-25 10:07 ` Stefan Behrens
2013-01-28 5:26 ` Anand Jain
2013-01-28 4:10 ` [PATCH 00/10 v3] add show sub-command for btrfs " Anand Jain
2013-01-28 4:10 ` [PATCH 01/10] Btrfs-progs: move open_file_or_dir() to utils.c Anand Jain
2013-01-28 4:10 ` [PATCH 02/10] Btrfs-progs: move printing subvol list outside of btrfs_list_subvols Anand Jain
2013-01-28 4:10 ` [PATCH 03/10] Btrfs-progs: add parent uuid for snapshots Anand Jain
2013-01-28 4:10 ` [PATCH 04/10] Btrfs-progs: move struct root_info to btrfs-list.h Anand Jain
2013-01-28 4:10 ` [PATCH 05/10] Btrfs-progs: add function btrfs_get_subvol to get root_info of a subvol Anand Jain
2013-01-28 4:10 ` [PATCH 06/10] Btrfs-progs: add method to filter snapshots by parent uuid Anand Jain
2013-01-28 4:10 ` [PATCH 07/10] Btrfs-progs: put find_mount_root() in commands.h Anand Jain
2013-01-28 4:10 ` [PATCH 08/10] Btrfs-progs: make printing subvol extensible to newer layouts Anand Jain
2013-01-28 4:10 ` [PATCH 09/10] Btrfs-progs: make get_subvol_name non cmds-send specific Anand Jain
2013-01-28 4:10 ` [PATCH 10/10] Btrfs-progs: add show subcommand to subvol cli Anand Jain
2013-01-28 5:29 ` [PATCH 00/10 v3] add show sub-command for btrfs " Anand Jain
2013-01-28 5:22 ` [RESEND] " Anand Jain
2013-01-28 5:22 ` [PATCH 01/10] Btrfs-progs: move open_file_or_dir() to utils.c Anand Jain
2013-01-28 18:08 ` David Sterba
2013-01-28 5:22 ` [PATCH 02/10] Btrfs-progs: move printing subvol list outside of btrfs_list_subvols Anand Jain
2013-01-28 5:22 ` [PATCH 03/10] Btrfs-progs: add parent uuid for snapshots Anand Jain
2013-01-28 5:22 ` [PATCH 04/10] Btrfs-progs: move struct root_info to btrfs-list.h Anand Jain
2013-01-28 5:22 ` [PATCH 05/10] Btrfs-progs: add function btrfs_get_subvol to get root_info of a subvol Anand Jain
2013-01-29 4:42 ` Wang Shilong
2013-01-28 18:04 ` David Sterba
2013-01-29 6:59 ` Anand Jain
2013-01-28 5:22 ` [PATCH 06/10] Btrfs-progs: add method to filter snapshots by parent uuid Anand Jain
2013-01-28 5:22 ` [PATCH 07/10] Btrfs-progs: put find_mount_root() in commands.h Anand Jain
2013-01-28 5:22 ` [PATCH 08/10] Btrfs-progs: make printing subvol extensible to newer layouts Anand Jain
2013-01-28 5:22 ` [PATCH 09/10] Btrfs-progs: make get_subvol_name non cmds-send specific Anand Jain
2013-01-28 5:22 ` [PATCH 10/10] Btrfs-progs: add show subcommand to subvol cli Anand Jain
2013-01-29 6:48 ` [PATCH 00/12 v4] add show sub-command for btrfs " Anand Jain
2013-01-29 6:48 ` [PATCH 01/12] Btrfs-progs: move open_file_or_dir() to utils.c Anand Jain
2013-01-29 6:48 ` [PATCH 02/12] Btrfs-progs: move printing subvol list outside of btrfs_list_subvols Anand Jain
2013-01-30 3:27 ` Wang Shilong
2013-01-30 9:57 ` Anand Jain
2013-01-29 6:48 ` [PATCH 03/12] Btrfs-progs: add parent uuid for snapshots Anand Jain
2013-01-29 6:48 ` [PATCH 04/12] Btrfs-progs: move struct root_info to btrfs-list.h Anand Jain
2013-01-29 6:48 ` [PATCH 05/12] Btrfs-progs: add function btrfs_get_subvol to get root_info of a subvol Anand Jain
2013-01-29 6:48 ` [PATCH 06/12] Btrfs-progs: add method to filter snapshots by parent uuid Anand Jain
2013-01-29 6:48 ` [PATCH 07/12] Btrfs-progs: put find_mount_root() in commands.h Anand Jain
2013-01-29 6:48 ` [PATCH 08/12] Btrfs-progs: make printing subvol extensible to newer layouts Anand Jain
2013-01-29 6:48 ` [PATCH 09/12] Btrfs-progs: make get_subvol_name non cmds-send specific Anand Jain
2013-01-29 6:48 ` [PATCH 10/12] Btrfs-progs: add show subcommand to subvol cli Anand Jain
2013-01-30 10:32 ` Wang Shilong
2013-01-31 3:13 ` Anand Jain
2013-01-29 6:49 ` [PATCH 11/12] Btrfs-progs: filter the deleted subvolumes when listing snapshots Anand Jain
2013-01-29 6:49 ` Anand Jain [this message]
2013-01-30 9:56 ` [PATCH 00/12 v5] Btrfs-progs: add show sub-command for btrfs subvol cli Anand Jain
2013-01-30 9:56 ` [PATCH 01/12] Btrfs-progs: move printing subvol list outside of btrfs_list_subvols Anand Jain
2013-01-30 9:56 ` [PATCH 02/12] Btrfs-progs: add parent uuid for snapshots Anand Jain
2013-01-30 9:56 ` [PATCH 03/12] Btrfs-progs: move struct root_info to btrfs-list.h Anand Jain
2013-01-30 9:56 ` [PATCH 04/12] Btrfs-progs: add function btrfs_get_subvol to get root_info of a subvol Anand Jain
2013-01-30 9:56 ` [PATCH 05/12] Btrfs-progs: add method to filter snapshots by parent uuid Anand Jain
2013-01-30 9:56 ` [PATCH 06/12] Btrfs-progs: put find_mount_root() in commands.h Anand Jain
2013-01-30 9:56 ` [PATCH 07/12] Btrfs-progs: make printing subvol extensible to newer layouts Anand Jain
2013-01-30 9:56 ` [PATCH 08/12] Btrfs-progs: make get_subvol_name non cmds-send specific Anand Jain
2013-01-30 9:56 ` [PATCH 09/12] Btrfs-progs: add show subcommand to subvol cli Anand Jain
2013-01-30 9:56 ` [PATCH 10/12] Btrfs-progs: filter the deleted subvolumes when listing snapshots Anand Jain
2013-01-30 9:56 ` [PATCH 11/12] Btrfs-progs: update btrfs_get_subvol to be inline with resolve_root ret changes Anand Jain
2013-01-30 9:56 ` [PATCH 12/12] Btrfs-progs: Fix a small memory leak in managing the btrfs list filter Anand Jain
2013-02-01 7:56 ` [PATCH 00/13 v6] Btrfs-progs: add show sub-command for btrfs subvol cli Anand Jain
2013-02-01 7:56 ` [PATCH 01/13] Btrfs-progs: move printing subvol list outside of btrfs_list_subvols Anand Jain
2013-02-01 7:56 ` [PATCH 02/13] Btrfs-progs: add parent uuid for snapshots Anand Jain
2013-02-01 7:56 ` [PATCH 03/13] Btrfs-progs: move struct root_info to btrfs-list.h Anand Jain
2013-02-01 7:56 ` [PATCH 04/13] Btrfs-progs: add function btrfs_get_subvol to get root_info of a subvol Anand Jain
2013-02-01 7:56 ` [PATCH 05/13] Btrfs-progs: add method to filter snapshots by parent uuid Anand Jain
2013-02-01 7:56 ` [PATCH 06/13] Btrfs-progs: put find_mount_root() in commands.h Anand Jain
2013-02-01 7:56 ` [PATCH 07/13] Btrfs-progs: make printing subvol extensible to newer layouts Anand Jain
2013-02-01 7:56 ` [PATCH 08/13] Btrfs-progs: make get_subvol_name non cmds-send specific Anand Jain
2013-02-01 7:56 ` [PATCH 09/13] Btrfs-progs: add show subcommand to subvol cli Anand Jain
2013-02-01 7:56 ` [PATCH 10/13] Btrfs-progs: filter the deleted subvolumes when listing snapshots Anand Jain
2013-02-01 7:56 ` [PATCH 11/13] Btrfs-progs: update btrfs_get_subvol to be inline with resolve_root ret changes Anand Jain
2013-02-01 7:56 ` [PATCH 12/13] Btrfs-progs: Fix a small memory leak in managing the btrfs list filter Anand Jain
2013-02-01 7:56 ` [PATCH 13/13] Btrfs-progs: add subvol flags to print 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=1359442141-25498-13-git-send-email-anand.jain@oracle.com \
--to=anand.jain@oracle.com \
--cc=dsterba@suse.cz \
--cc=gene@czarc.net \
--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).