* [PATCH v2] btrfs: handle failures of set_extent_bits in add_excluded_extent
@ 2018-05-23 3:37 Gu Jinxiang
2018-05-23 6:13 ` Nikolay Borisov
0 siblings, 1 reply; 2+ messages in thread
From: Gu Jinxiang @ 2018-05-23 3:37 UTC (permalink / raw)
To: linux-btrfs; +Cc: nborisov, dsterba
set_extent_bits may fail, return the result in add_excluded_extent.
Signed-off-by: Gu Jinxiang <gujx@cn.fujitsu.com>
Changelog:
v2-v1:
1.remove goto to make the function run linearly.
2.change commit description not pointing out the failure detail,
since set_extent_bits's failure type may be added.
---
fs/btrfs/extent-tree.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 75cfb80d2551..65ef3456fa62 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -215,11 +215,15 @@ static int add_excluded_extent(struct btrfs_fs_info *fs_info,
u64 start, u64 num_bytes)
{
u64 end = start + num_bytes - 1;
- set_extent_bits(&fs_info->freed_extents[0],
+ int ret = 0;
+
+ ret = set_extent_bits(&fs_info->freed_extents[0],
start, end, EXTENT_UPTODATE);
- set_extent_bits(&fs_info->freed_extents[1],
+ if (ret)
+ return ret;
+ ret = set_extent_bits(&fs_info->freed_extents[1],
start, end, EXTENT_UPTODATE);
- return 0;
+ return ret;
}
static void free_excluded_extents(struct btrfs_fs_info *fs_info,
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] btrfs: handle failures of set_extent_bits in add_excluded_extent
2018-05-23 3:37 [PATCH v2] btrfs: handle failures of set_extent_bits in add_excluded_extent Gu Jinxiang
@ 2018-05-23 6:13 ` Nikolay Borisov
0 siblings, 0 replies; 2+ messages in thread
From: Nikolay Borisov @ 2018-05-23 6:13 UTC (permalink / raw)
To: Gu Jinxiang, linux-btrfs; +Cc: dsterba
On 23.05.2018 06:37, Gu Jinxiang wrote:
> set_extent_bits may fail, return the result in add_excluded_extent.
>
> Signed-off-by: Gu Jinxiang <gujx@cn.fujitsu.com>
Reviewed-by: Nikolay Borisov <nborisvo@suse.com>
> Changelog:
> v2-v1:
> 1.remove goto to make the function run linearly.
> 2.change commit description not pointing out the failure detail,
> since set_extent_bits's failure type may be added.
The changelog should really go under the scissors line but no need to
resend.
> ---
> fs/btrfs/extent-tree.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
> index 75cfb80d2551..65ef3456fa62 100644
> --- a/fs/btrfs/extent-tree.c
> +++ b/fs/btrfs/extent-tree.c
> @@ -215,11 +215,15 @@ static int add_excluded_extent(struct btrfs_fs_info *fs_info,
> u64 start, u64 num_bytes)
> {
> u64 end = start + num_bytes - 1;
> - set_extent_bits(&fs_info->freed_extents[0],
> + int ret = 0;
> +
> + ret = set_extent_bits(&fs_info->freed_extents[0],
> start, end, EXTENT_UPTODATE);
> - set_extent_bits(&fs_info->freed_extents[1],
> + if (ret)
> + return ret;
> + ret = set_extent_bits(&fs_info->freed_extents[1],
> start, end, EXTENT_UPTODATE);
> - return 0;
> + return ret;
> }
>
> static void free_excluded_extents(struct btrfs_fs_info *fs_info,
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-05-23 6:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-23 3:37 [PATCH v2] btrfs: handle failures of set_extent_bits in add_excluded_extent Gu Jinxiang
2018-05-23 6:13 ` Nikolay Borisov
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).