From: Gu Jinxiang <gujx@cn.fujitsu.com>
To: <linux-btrfs@vger.kernel.org>
Cc: <nborisov@suse.com>
Subject: [PATCH] btrfs: handle failures of set_extent_bits in add_excluded_extent
Date: Tue, 22 May 2018 11:51:39 +0800 [thread overview]
Message-ID: <1526961099-5922-1-git-send-email-gujx@cn.fujitsu.com> (raw)
set_extent_bits may return 0/-EEXIST, so return the result in
add_excluded_extent. And handle the failures in upper callers.
Caller of add_excluded_extent and failure process currently:
exclude_super_stripes
<- btrfs_make_block_group //handles the failure
<- btrfs_read_block_groups //handles the failure
__exclude_logged_extent
<- btrfs_exclude_logged_extents
<- btrfs_alloc_logged_file_extent //propagate failure to upper
caller
Add logic of propagate return value of __exclude_logged_extent to
btrfs_exclude_logged_extents.
Signed-off-by: Gu Jinxiang <gujx@cn.fujitsu.com>
---
fs/btrfs/extent-tree.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 75cfb80d2551..28fd71579141 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -215,11 +215,16 @@ 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)
+ goto out;
+ ret = set_extent_bits(&fs_info->freed_extents[1],
start, end, EXTENT_UPTODATE);
- return 0;
+out:
+ return ret;
}
static void free_excluded_extents(struct btrfs_fs_info *fs_info,
@@ -6463,6 +6468,7 @@ int btrfs_exclude_logged_extents(struct btrfs_fs_info *fs_info,
struct btrfs_key key;
int found_type;
int i;
+ int ret = 0;
if (!btrfs_fs_incompat(fs_info, MIXED_GROUPS))
return 0;
@@ -6479,10 +6485,14 @@ int btrfs_exclude_logged_extents(struct btrfs_fs_info *fs_info,
continue;
key.objectid = btrfs_file_extent_disk_bytenr(eb, item);
key.offset = btrfs_file_extent_disk_num_bytes(eb, item);
- __exclude_logged_extent(fs_info, key.objectid, key.offset);
+ ret = __exclude_logged_extent(fs_info, key.objectid,
+ key.offset);
+ if (ret)
+ goto out;
}
- return 0;
+out:
+ return ret;
}
static void
--
1.9.1
next reply other threads:[~2018-05-22 3:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-22 3:51 Gu Jinxiang [this message]
2018-05-22 8:20 ` [PATCH] btrfs: handle failures of set_extent_bits in add_excluded_extent Nikolay Borisov
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=1526961099-5922-1-git-send-email-gujx@cn.fujitsu.com \
--to=gujx@cn.fujitsu.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=nborisov@suse.com \
/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).