From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org, dsterba@suse.cz, gene@czarc.net
Subject: [PATCH 04/10] Btrfs-progs: move struct root_info to btrfs-list.h
Date: Mon, 28 Jan 2013 12:10:22 +0800 [thread overview]
Message-ID: <1359346228-24804-5-git-send-email-anand.jain@oracle.com> (raw)
In-Reply-To: <1359346228-24804-1-git-send-email-anand.jain@oracle.com>
As we would add more ways to list and manage the subvols
and snapshots, its better if we have struct root_info
defined in the header file.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
btrfs-list.c | 47 -----------------------------------------------
btrfs-list.h | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 46 insertions(+), 48 deletions(-)
diff --git a/btrfs-list.c b/btrfs-list.c
index 13a365d..909d814 100644
--- a/btrfs-list.c
+++ b/btrfs-list.c
@@ -46,53 +46,6 @@ struct root_lookup {
struct rb_root root;
};
-/*
- * one of these for each root we find.
- */
-struct root_info {
- struct rb_node rb_node;
- struct rb_node sort_node;
-
- /* this root's id */
- u64 root_id;
-
- /* equal the offset of the root's key */
- u64 root_offset;
-
- /* flags of the root */
- u64 flags;
-
- /* the id of the root that references this one */
- u64 ref_tree;
-
- /* the dir id we're in from ref_tree */
- u64 dir_id;
-
- u64 top_id;
-
- /* generation when the root is created or last updated */
- u64 gen;
-
- /* creation generation of this root in sec*/
- u64 ogen;
-
- /* creation time of this root in sec*/
- time_t otime;
-
- u8 uuid[BTRFS_UUID_SIZE];
- u8 puuid[BTRFS_UUID_SIZE];
-
- /* path from the subvol we live in to this root, including the
- * root's name. This is null until we do the extra lookup ioctl.
- */
- char *path;
-
- /* the name of this root in the directory it lives in */
- char *name;
-
- char *full_path;
-};
-
struct {
char *name;
char *column_name;
diff --git a/btrfs-list.h b/btrfs-list.h
index 855e73d..3b7b680 100644
--- a/btrfs-list.h
+++ b/btrfs-list.h
@@ -18,7 +18,52 @@
#include "kerncompat.h"
-struct root_info;
+/*
+ * one of these for each root we find.
+ */
+struct root_info {
+ struct rb_node rb_node;
+ struct rb_node sort_node;
+
+ /* this root's id */
+ u64 root_id;
+
+ /* equal the offset of the root's key */
+ u64 root_offset;
+
+ /* flags of the root */
+ u64 flags;
+
+ /* the id of the root that references this one */
+ u64 ref_tree;
+
+ /* the dir id we're in from ref_tree */
+ u64 dir_id;
+
+ u64 top_id;
+
+ /* generation when the root is created or last updated */
+ u64 gen;
+
+ /* creation generation of this root in sec*/
+ u64 ogen;
+
+ /* creation time of this root in sec*/
+ time_t otime;
+
+ u8 uuid[BTRFS_UUID_SIZE];
+ u8 puuid[BTRFS_UUID_SIZE];
+
+ /* path from the subvol we live in to this root, including the
+ * root's name. This is null until we do the extra lookup ioctl.
+ */
+ char *path;
+
+ /* the name of this root in the directory it lives in */
+ char *name;
+
+ char *full_path;
+};
typedef int (*btrfs_list_filter_func)(struct root_info *, u64);
typedef int (*btrfs_list_comp_func)(struct root_info *, struct root_info *,
--
1.8.1.227.g44fe835
next prev parent reply other threads:[~2013-01-28 4:04 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 ` Anand Jain [this message]
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 ` [PATCH 12/12] Btrfs-progs: update btrfs_get_subvol to be inline with resolve_root ret changes Anand Jain
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=1359346228-24804-5-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).