From: "Darrick J. Wong" Subject: Re: [PATCH v3 09/30] libext2fs: check inline_data in ext2fs_xattrs_read/write Date: Fri, 6 Dec 2013 13:38:26 -0800 Message-ID: <20131206213826.GB10143@birch.djwong.org> References: <1386323897-2354-1-git-send-email-wenqing.lz@taobao.com> <1386323897-2354-10-git-send-email-wenqing.lz@taobao.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linux-ext4@vger.kernel.org, "Theodore Ts'o" , Zheng Liu To: Zheng Liu Return-path: Received: from userp1040.oracle.com ([156.151.31.81]:26217 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754730Ab3LFVif (ORCPT ); Fri, 6 Dec 2013 16:38:35 -0500 Content-Disposition: inline In-Reply-To: <1386323897-2354-10-git-send-email-wenqing.lz@taobao.com> Sender: linux-ext4-owner@vger.kernel.org List-ID: On Fri, Dec 06, 2013 at 05:57:56PM +0800, Zheng Liu wrote: > From: Zheng Liu > > 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'. Oops, I removed both of those checks in favor of looking for ext_attr or inline_data in ext2fs_xattrs_open(). Oh well, sorry about the miscommunication. --D > > Signed-off-by: Zheng Liu > --- > 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@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html