From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Cc: dsterba@suse.cz, peteryuchuang@gmail.com
Subject: [PATCH 1/4] btrfs-progs: Limit inline extent below page size
Date: Thu, 1 Mar 2018 10:47:44 +0800 [thread overview]
Message-ID: <20180301024747.26192-2-wqu@suse.com> (raw)
In-Reply-To: <20180301024747.26192-1-wqu@suse.com>
Kernel doesn't support to drop extent inside an inlined extent.
And kernel tends to limit inline extent just below sectorsize, so also
limit it in btrfs-progs.
This fixes unexpected -EOPNOTSUPP error from __btrfs_drop_extents() on
converted btrfs.
Fixes: 806528b8755f ("Add Yan Zheng's ext3->btrfs conversion program")
Reported-by: Peter Y. Chuang <peteryuchuang@gmail.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
ctree.h | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/ctree.h b/ctree.h
index 17cdac76c58c..0282deef339b 100644
--- a/ctree.h
+++ b/ctree.h
@@ -20,6 +20,7 @@
#define __BTRFS_CTREE_H__
#include <stdbool.h>
+#include "internal.h"
#if BTRFS_FLAT_INCLUDES
#include "list.h"
@@ -1195,8 +1196,14 @@ static inline u32 BTRFS_NODEPTRS_PER_BLOCK(const struct btrfs_fs_info *info)
(offsetof(struct btrfs_file_extent_item, disk_bytenr))
static inline u32 BTRFS_MAX_INLINE_DATA_SIZE(const struct btrfs_fs_info *info)
{
- return BTRFS_MAX_ITEM_SIZE(info) -
- BTRFS_FILE_EXTENT_INLINE_DATA_START;
+ /*
+ * Inline extent larger than pagesize could lead to kernel unexpected
+ * error when dropping extents, so we need to limit the inline extent
+ * size to less than sectorsize.
+ */
+ return min_t(u32, info->sectorsize - 1,
+ BTRFS_MAX_ITEM_SIZE(info) -
+ BTRFS_FILE_EXTENT_INLINE_DATA_START);
}
static inline u32 BTRFS_MAX_XATTR_SIZE(const struct btrfs_fs_info *info)
--
2.16.2
next prev parent reply other threads:[~2018-03-01 2:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-01 2:47 [PATCH 0/4] Fix long standing -EOPNOTSUPP problem caused by Qu Wenruo
2018-03-01 2:47 ` Qu Wenruo [this message]
2018-03-01 17:47 ` [PATCH 1/4] btrfs-progs: Limit inline extent below page size Nikolay Borisov
2018-03-01 23:43 ` Qu Wenruo
2018-03-09 16:51 ` David Sterba
2018-03-01 2:47 ` [PATCH 2/4] btrfs-progs: check/original mode: Check inline extent size Qu Wenruo
2018-03-01 2:59 ` Su Yue
2018-03-01 2:47 ` [PATCH 3/4] btrfs-progs: check/lowmem " Qu Wenruo
2018-03-01 2:59 ` Su Yue
2018-03-01 2:47 ` [PATCH 4/4] btrfs-progs: test/convert: Add test case for invalid large inline data extent Qu Wenruo
2018-03-01 14:53 ` [PATCH 0/4] Fix long standing -EOPNOTSUPP problem caused by David Sterba
2018-03-02 5:25 ` Qu Wenruo
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=20180301024747.26192-2-wqu@suse.com \
--to=wqu@suse.com \
--cc=dsterba@suse.cz \
--cc=linux-btrfs@vger.kernel.org \
--cc=peteryuchuang@gmail.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).