From: Zheng Liu <wenqing.lz@xxxxxxxxxx>
Now on kernel side we can enable inline data even without ext_attr. So
we need to adjust sanity check on ext2fs_xattrs_read/write to let we
access extended attribute when filesystem is create with '-O ^ext_attr,
inline_data'.
Signed-off-by: Zheng Liu <wenqing.lz@xxxxxxxxxx>
---
lib/ext2fs/ext_attr.c | 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/lib/ext2fs/ext_attr.c b/lib/ext2fs/ext_attr.c
index 09e13b2..e5e0fa9 100644
--- a/lib/ext2fs/ext_attr.c
+++ b/lib/ext2fs/ext_attr.c
@@ -469,9 +469,17 @@ errcode_t ext2fs_xattrs_write(struct ext2_xattr_handle *handle)
unsigned int i;
errcode_t err;
- if (!EXT2_HAS_COMPAT_FEATURE(handle->fs->super,
- EXT2_FEATURE_COMPAT_EXT_ATTR))
- return 0;
+ /*
+ * If inline_data is enabled, we don't check ext_attr because
+ * inline_data needs to read/write extended attribute even
+ * without ext_attr.
+ */
+ if (!EXT2_HAS_INCOMPAT_FEATURE(handle->fs->super,
+ EXT4_FEATURE_INCOMPAT_INLINE_DATA)) {
+ if (!EXT2_HAS_COMPAT_FEATURE(handle->fs->super,
+ EXT2_FEATURE_COMPAT_EXT_ATTR))
+ return 0;
+ }
i = EXT2_INODE_SIZE(handle->fs->super);
if (i < sizeof(*inode))
@@ -684,9 +692,17 @@ errcode_t ext2fs_xattrs_read(struct ext2_xattr_handle *handle)
int i;
errcode_t err;
- if (!EXT2_HAS_COMPAT_FEATURE(handle->fs->super,
- EXT2_FEATURE_COMPAT_EXT_ATTR))
- return 0;
+ /*
+ * If inline_data is enabled, we don't check ext_attr because
+ * inline_data needs to read/write extended attribute even
+ * without ext_attr.
+ */
+ if (!EXT2_HAS_INCOMPAT_FEATURE(handle->fs->super,
+ EXT4_FEATURE_INCOMPAT_INLINE_DATA)) {
+ if (!EXT2_HAS_COMPAT_FEATURE(handle->fs->super,
+ EXT2_FEATURE_COMPAT_EXT_ATTR))
+ return 0;
+ }
i = EXT2_INODE_SIZE(handle->fs->super);
if (i < sizeof(*inode))
--
1.7.9.7
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
