* [PATCH v3] btrfs: Add helper function for free_root_pointers()
[not found] <20131030204834.GA20844@gmail.com>
@ 2013-10-30 21:15 ` Rashika Kheria
2013-11-02 16:59 ` [OPW kernel] " Josh Triplett
2013-11-02 18:24 ` [PATCH v4] " Rashika Kheria
1 sibling, 1 reply; 4+ messages in thread
From: Rashika Kheria @ 2013-10-30 21:15 UTC (permalink / raw)
To: opw-kernel, linux-btrfs, Zach Brown
The function free_root_pointers() in disk-io.h contains redundant code.
Therefore, this patch adds a helper function free_root_extent_buffers()
to free_root_pointers() to eliminate redundancy.
Reviewed-by: Zach Brown <zab@redhat.com>
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
---
This revision fixes the following issues of the previous revision-
Incorrect commit message
fs/btrfs/disk-io.c | 60 +++++++++++++++++-----------------------------------
1 file changed, 19 insertions(+), 41 deletions(-)
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 4ae17ed..25fb77a 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2012,50 +2012,28 @@ static void btrfs_stop_all_workers(struct btrfs_fs_info *fs_info)
btrfs_stop_workers(&fs_info->qgroup_rescan_workers);
}
+static void free_root_extent_buffers(struct btrfs_root *root)
+{
+ if (root) {
+ free_extent_buffer(root->node);
+ free_extent_buffer(root->commit_root);
+ root->node = NULL;
+ root->commit_root = NULL;
+ }
+}
+
/* helper to cleanup tree roots */
static void free_root_pointers(struct btrfs_fs_info *info, int chunk_root)
{
- free_extent_buffer(info->tree_root->node);
- free_extent_buffer(info->tree_root->commit_root);
- info->tree_root->node = NULL;
- info->tree_root->commit_root = NULL;
-
- if (info->dev_root) {
- free_extent_buffer(info->dev_root->node);
- free_extent_buffer(info->dev_root->commit_root);
- info->dev_root->node = NULL;
- info->dev_root->commit_root = NULL;
- }
- if (info->extent_root) {
- free_extent_buffer(info->extent_root->node);
- free_extent_buffer(info->extent_root->commit_root);
- info->extent_root->node = NULL;
- info->extent_root->commit_root = NULL;
- }
- if (info->csum_root) {
- free_extent_buffer(info->csum_root->node);
- free_extent_buffer(info->csum_root->commit_root);
- info->csum_root->node = NULL;
- info->csum_root->commit_root = NULL;
- }
- if (info->quota_root) {
- free_extent_buffer(info->quota_root->node);
- free_extent_buffer(info->quota_root->commit_root);
- info->quota_root->node = NULL;
- info->quota_root->commit_root = NULL;
- }
- if (info->uuid_root) {
- free_extent_buffer(info->uuid_root->node);
- free_extent_buffer(info->uuid_root->commit_root);
- info->uuid_root->node = NULL;
- info->uuid_root->commit_root = NULL;
- }
- if (chunk_root) {
- free_extent_buffer(info->chunk_root->node);
- free_extent_buffer(info->chunk_root->commit_root);
- info->chunk_root->node = NULL;
- info->chunk_root->commit_root = NULL;
- }
+ free_root_extent_buffers(info->tree_root);
+
+ free_root_extent_buffers(info->dev_root);
+ free_root_extent_buffers(info->extent_root);
+ free_root_extent_buffers(info->csum_root);
+ free_root_extent_buffers(info->quota_root);
+ free_root_extent_buffers(info->uuid_root);
+ if (chunk_root)
+ free_root_extent_buffers(info->chunk_root);
}
static void del_fs_roots(struct btrfs_fs_info *fs_info)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [OPW kernel] [PATCH v3] btrfs: Add helper function for free_root_pointers()
2013-10-30 21:15 ` [PATCH v3] btrfs: Add helper function for free_root_pointers() Rashika Kheria
@ 2013-11-02 16:59 ` Josh Triplett
0 siblings, 0 replies; 4+ messages in thread
From: Josh Triplett @ 2013-11-02 16:59 UTC (permalink / raw)
To: Rashika Kheria; +Cc: opw-kernel, linux-btrfs, Zach Brown
On Thu, Oct 31, 2013 at 02:45:20AM +0530, Rashika Kheria wrote:
> The function free_root_pointers() in disk-io.h contains redundant code.
> Therefore, this patch adds a helper function free_root_extent_buffers()
> to free_root_pointers() to eliminate redundancy.
>
> Reviewed-by: Zach Brown <zab@redhat.com>
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
(In general, the Reviewed-by goes after the Signed-off-by.)
One minor nit:
> --- a/fs/btrfs/disk-io.c
> +++ b/fs/btrfs/disk-io.c
> @@ -2012,50 +2012,28 @@ static void btrfs_stop_all_workers(struct btrfs_fs_info *fs_info)
> btrfs_stop_workers(&fs_info->qgroup_rescan_workers);
> }
>
> +static void free_root_extent_buffers(struct btrfs_root *root)
> +{
> + if (root) {
> + free_extent_buffer(root->node);
> + free_extent_buffer(root->commit_root);
> + root->node = NULL;
> + root->commit_root = NULL;
> + }
> +}
I'd tend to write this with an early return if (!root). In this case it
doesn't matter much, but it's a good habit to get into for larger
functions with deeper indentation.
- Josh Triplett
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v4] btrfs: Add helper function for free_root_pointers()
[not found] <20131030204834.GA20844@gmail.com>
2013-10-30 21:15 ` [PATCH v3] btrfs: Add helper function for free_root_pointers() Rashika Kheria
@ 2013-11-02 18:24 ` Rashika Kheria
2013-11-02 20:39 ` Josef Back
1 sibling, 1 reply; 4+ messages in thread
From: Rashika Kheria @ 2013-11-02 18:24 UTC (permalink / raw)
To: opw-kernel, linux-btrfs, Zach Brown
The function free_root_pointers() in disk-io.h contains redundant code.
Therefore, this patch adds a helper function free_root_extent_buffers()
to free_root_pointers() to eliminate redundancy
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Zach Brown <zab@redhat.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
---
This revision fixes the following issues of the previous revision-
Early return when root is NULL
fs/btrfs/disk-io.c | 60 +++++++++++++++++-----------------------------------
1 file changed, 19 insertions(+), 41 deletions(-)
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 62176ad..f719394 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2013,50 +2013,28 @@ static void btrfs_stop_all_workers(struct btrfs_fs_info *fs_info)
btrfs_stop_workers(&fs_info->qgroup_rescan_workers);
}
+static void free_root_extent_buffers(struct btrfs_root *root)
+{
+ if (!root)
+ return;
+ free_extent_buffer(root->node);
+ free_extent_buffer(root->commit_root);
+ root->node = NULL;
+ root->commit_root = NULL;
+}
+
/* helper to cleanup tree roots */
static void free_root_pointers(struct btrfs_fs_info *info, int chunk_root)
{
- free_extent_buffer(info->tree_root->node);
- free_extent_buffer(info->tree_root->commit_root);
- info->tree_root->node = NULL;
- info->tree_root->commit_root = NULL;
-
- if (info->dev_root) {
- free_extent_buffer(info->dev_root->node);
- free_extent_buffer(info->dev_root->commit_root);
- info->dev_root->node = NULL;
- info->dev_root->commit_root = NULL;
- }
- if (info->extent_root) {
- free_extent_buffer(info->extent_root->node);
- free_extent_buffer(info->extent_root->commit_root);
- info->extent_root->node = NULL;
- info->extent_root->commit_root = NULL;
- }
- if (info->csum_root) {
- free_extent_buffer(info->csum_root->node);
- free_extent_buffer(info->csum_root->commit_root);
- info->csum_root->node = NULL;
- info->csum_root->commit_root = NULL;
- }
- if (info->quota_root) {
- free_extent_buffer(info->quota_root->node);
- free_extent_buffer(info->quota_root->commit_root);
- info->quota_root->node = NULL;
- info->quota_root->commit_root = NULL;
- }
- if (info->uuid_root) {
- free_extent_buffer(info->uuid_root->node);
- free_extent_buffer(info->uuid_root->commit_root);
- info->uuid_root->node = NULL;
- info->uuid_root->commit_root = NULL;
- }
- if (chunk_root) {
- free_extent_buffer(info->chunk_root->node);
- free_extent_buffer(info->chunk_root->commit_root);
- info->chunk_root->node = NULL;
- info->chunk_root->commit_root = NULL;
- }
+ free_root_extent_buffers(info->tree_root);
+
+ free_root_extent_buffers(info->dev_root);
+ free_root_extent_buffers(info->extent_root);
+ free_root_extent_buffers(info->csum_root);
+ free_root_extent_buffers(info->quota_root);
+ free_root_extent_buffers(info->uuid_root);
+ if (chunk_root)
+ free_root_extent_buffers(info->chunk_root);
}
static void del_fs_roots(struct btrfs_fs_info *fs_info)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v4] btrfs: Add helper function for free_root_pointers()
2013-11-02 18:24 ` [PATCH v4] " Rashika Kheria
@ 2013-11-02 20:39 ` Josef Back
0 siblings, 0 replies; 4+ messages in thread
From: Josef Back @ 2013-11-02 20:39 UTC (permalink / raw)
To: Rashika Kheria
Cc: opw-kernel@googlegroups.com, linux-btrfs@vger.kernel.org,
Zach Brown
I've already pulled v3 into btrfs-next, for this I prefer v3. Thanks,
Josef
> On Nov 2, 2013, at 2:24 PM, Rashika Kheria <rashika.kheria@gmail.com> wrote:
>
> The function free_root_pointers() in disk-io.h contains redundant code.
> Therefore, this patch adds a helper function free_root_extent_buffers()
> to free_root_pointers() to eliminate redundancy
>
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> Reviewed-by: Zach Brown <zab@redhat.com>
> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
> ---
>
> This revision fixes the following issues of the previous revision-
> Early return when root is NULL
>
> fs/btrfs/disk-io.c | 60 +++++++++++++++++-----------------------------------
> 1 file changed, 19 insertions(+), 41 deletions(-)
>
> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
> index 62176ad..f719394 100644
> --- a/fs/btrfs/disk-io.c
> +++ b/fs/btrfs/disk-io.c
> @@ -2013,50 +2013,28 @@ static void btrfs_stop_all_workers(struct btrfs_fs_info *fs_info)
> btrfs_stop_workers(&fs_info->qgroup_rescan_workers);
> }
>
> +static void free_root_extent_buffers(struct btrfs_root *root)
> +{
> + if (!root)
> + return;
> + free_extent_buffer(root->node);
> + free_extent_buffer(root->commit_root);
> + root->node = NULL;
> + root->commit_root = NULL;
> +}
> +
> /* helper to cleanup tree roots */
> static void free_root_pointers(struct btrfs_fs_info *info, int chunk_root)
> {
> - free_extent_buffer(info->tree_root->node);
> - free_extent_buffer(info->tree_root->commit_root);
> - info->tree_root->node = NULL;
> - info->tree_root->commit_root = NULL;
> -
> - if (info->dev_root) {
> - free_extent_buffer(info->dev_root->node);
> - free_extent_buffer(info->dev_root->commit_root);
> - info->dev_root->node = NULL;
> - info->dev_root->commit_root = NULL;
> - }
> - if (info->extent_root) {
> - free_extent_buffer(info->extent_root->node);
> - free_extent_buffer(info->extent_root->commit_root);
> - info->extent_root->node = NULL;
> - info->extent_root->commit_root = NULL;
> - }
> - if (info->csum_root) {
> - free_extent_buffer(info->csum_root->node);
> - free_extent_buffer(info->csum_root->commit_root);
> - info->csum_root->node = NULL;
> - info->csum_root->commit_root = NULL;
> - }
> - if (info->quota_root) {
> - free_extent_buffer(info->quota_root->node);
> - free_extent_buffer(info->quota_root->commit_root);
> - info->quota_root->node = NULL;
> - info->quota_root->commit_root = NULL;
> - }
> - if (info->uuid_root) {
> - free_extent_buffer(info->uuid_root->node);
> - free_extent_buffer(info->uuid_root->commit_root);
> - info->uuid_root->node = NULL;
> - info->uuid_root->commit_root = NULL;
> - }
> - if (chunk_root) {
> - free_extent_buffer(info->chunk_root->node);
> - free_extent_buffer(info->chunk_root->commit_root);
> - info->chunk_root->node = NULL;
> - info->chunk_root->commit_root = NULL;
> - }
> + free_root_extent_buffers(info->tree_root);
> +
> + free_root_extent_buffers(info->dev_root);
> + free_root_extent_buffers(info->extent_root);
> + free_root_extent_buffers(info->csum_root);
> + free_root_extent_buffers(info->quota_root);
> + free_root_extent_buffers(info->uuid_root);
> + if (chunk_root)
> + free_root_extent_buffers(info->chunk_root);
> }
>
> static void del_fs_roots(struct btrfs_fs_info *fs_info)
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-11-02 20:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20131030204834.GA20844@gmail.com>
2013-10-30 21:15 ` [PATCH v3] btrfs: Add helper function for free_root_pointers() Rashika Kheria
2013-11-02 16:59 ` [OPW kernel] " Josh Triplett
2013-11-02 18:24 ` [PATCH v4] " Rashika Kheria
2013-11-02 20:39 ` Josef Back
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).