* [PATCH] Btrfs: add missing error check to find_parent_nodes
@ 2013-07-30 18:54 Filipe David Borba Manana
2013-07-30 23:00 ` Zach Brown
2013-07-30 23:26 ` [PATCH v2] " Filipe David Borba Manana
0 siblings, 2 replies; 5+ messages in thread
From: Filipe David Borba Manana @ 2013-07-30 18:54 UTC (permalink / raw)
To: linux-btrfs; +Cc: Filipe David Borba Manana
Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>
---
fs/btrfs/backref.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index 8bc5e8c..1ba87c5 100644
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
@@ -935,6 +935,8 @@ again:
}
ret = find_extent_in_eb(eb, bytenr,
*extent_item_pos, &eie);
+ if (ret < 0)
+ goto out;
ref->inode_list = eie;
free_extent_buffer(eb);
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Btrfs: add missing error check to find_parent_nodes
2013-07-30 18:54 [PATCH] Btrfs: add missing error check to find_parent_nodes Filipe David Borba Manana
@ 2013-07-30 23:00 ` Zach Brown
2013-07-30 23:27 ` Filipe David Manana
2013-07-30 23:26 ` [PATCH v2] " Filipe David Borba Manana
1 sibling, 1 reply; 5+ messages in thread
From: Zach Brown @ 2013-07-30 23:00 UTC (permalink / raw)
To: Filipe David Borba Manana; +Cc: linux-btrfs
> diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
> index 8bc5e8c..1ba87c5 100644
> --- a/fs/btrfs/backref.c
> +++ b/fs/btrfs/backref.c
> @@ -935,6 +935,8 @@ again:
> }
> ret = find_extent_in_eb(eb, bytenr,
> *extent_item_pos, &eie);
> + if (ret < 0)
> + goto out;
> ref->inode_list = eie;
> free_extent_buffer(eb);
> }
The eb needs to be freed before the goto.
And that there's now *three* eb freeing paths in this block should be a
hint that it should be refactored into a function that frees the eb
before returning.
- z
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Btrfs: add missing error check to find_parent_nodes
2013-07-30 23:00 ` Zach Brown
@ 2013-07-30 23:27 ` Filipe David Manana
0 siblings, 0 replies; 5+ messages in thread
From: Filipe David Manana @ 2013-07-30 23:27 UTC (permalink / raw)
To: Zach Brown; +Cc: linux-btrfs@vger.kernel.org
On Wed, Jul 31, 2013 at 12:00 AM, Zach Brown <zab@redhat.com> wrote:
>> diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
>> index 8bc5e8c..1ba87c5 100644
>> --- a/fs/btrfs/backref.c
>> +++ b/fs/btrfs/backref.c
>> @@ -935,6 +935,8 @@ again:
>> }
>> ret = find_extent_in_eb(eb, bytenr,
>> *extent_item_pos, &eie);
>> + if (ret < 0)
>> + goto out;
>> ref->inode_list = eie;
>> free_extent_buffer(eb);
>> }
>
> The eb needs to be freed before the goto.
>
> And that there's now *three* eb freeing paths in this block should be a
> hint that it should be refactored into a function that frees the eb
> before returning.
Thanks, missed that previously.
>
> - z
--
Filipe David Manana,
"Reasonable men adapt themselves to the world.
Unreasonable men adapt the world to themselves.
That's why all progress depends on unreasonable men."
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] Btrfs: add missing error check to find_parent_nodes
2013-07-30 18:54 [PATCH] Btrfs: add missing error check to find_parent_nodes Filipe David Borba Manana
2013-07-30 23:00 ` Zach Brown
@ 2013-07-30 23:26 ` Filipe David Borba Manana
2013-07-31 9:07 ` Jan Schmidt
1 sibling, 1 reply; 5+ messages in thread
From: Filipe David Borba Manana @ 2013-07-30 23:26 UTC (permalink / raw)
To: linux-btrfs; +Cc: Filipe David Borba Manana
Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>
---
V2: Ensure extent buffer is freed on error.
fs/btrfs/backref.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index 8bc5e8c..980e85a 100644
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
@@ -935,8 +935,10 @@ again:
}
ret = find_extent_in_eb(eb, bytenr,
*extent_item_pos, &eie);
- ref->inode_list = eie;
free_extent_buffer(eb);
+ if (ret < 0)
+ goto out;
+ ref->inode_list = eie;
}
ret = ulist_add_merge(refs, ref->parent,
(uintptr_t)ref->inode_list,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] Btrfs: add missing error check to find_parent_nodes
2013-07-30 23:26 ` [PATCH v2] " Filipe David Borba Manana
@ 2013-07-31 9:07 ` Jan Schmidt
0 siblings, 0 replies; 5+ messages in thread
From: Jan Schmidt @ 2013-07-31 9:07 UTC (permalink / raw)
To: Filipe David Borba Manana; +Cc: linux-btrfs
On Wed, July 31, 2013 at 01:26 (+0200), Filipe David Borba Manana wrote:
> Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>
> ---
>
> V2: Ensure extent buffer is freed on error.
>
> fs/btrfs/backref.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
> index 8bc5e8c..980e85a 100644
> --- a/fs/btrfs/backref.c
> +++ b/fs/btrfs/backref.c
> @@ -935,8 +935,10 @@ again:
> }
> ret = find_extent_in_eb(eb, bytenr,
> *extent_item_pos, &eie);
> - ref->inode_list = eie;
> free_extent_buffer(eb);
> + if (ret < 0)
> + goto out;
> + ref->inode_list = eie;
> }
> ret = ulist_add_merge(refs, ref->parent,
> (uintptr_t)ref->inode_list,
>
The only ret < 0 I'm seeing is ENOMEM, so that should be safe.
Reviewed-by: Jan Schmidt <list.btrfs@jan-o-sch.net>
Thanks,
-Jan
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-07-31 9:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-30 18:54 [PATCH] Btrfs: add missing error check to find_parent_nodes Filipe David Borba Manana
2013-07-30 23:00 ` Zach Brown
2013-07-30 23:27 ` Filipe David Manana
2013-07-30 23:26 ` [PATCH v2] " Filipe David Borba Manana
2013-07-31 9:07 ` Jan Schmidt
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).