Commit fc6a8b0d authored by Nathan Scott's avatar Nathan Scott

[XFS] Fix shortform attr flags botch affecting listxattr - from Andreas Gruenbacher.

SGI Modid: xfs-linux:xfs-kern:169199a
parent 881ceebe
...@@ -575,8 +575,8 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context) ...@@ -575,8 +575,8 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
for ( ; i < nsbuf; i++, sbp++) { for ( ; i < nsbuf; i++, sbp++) {
attrnames_t *namesp; attrnames_t *namesp;
namesp = (sfe->flags & XFS_ATTR_SECURE) ? &attr_secure : namesp = (sbp->flags & XFS_ATTR_SECURE) ? &attr_secure :
((sfe->flags & XFS_ATTR_ROOT) ? &attr_trusted : ((sbp->flags & XFS_ATTR_ROOT) ? &attr_trusted :
&attr_user); &attr_user);
if (cursor->hashval != INT_GET(sbp->hash, ARCH_CONVERT)) { if (cursor->hashval != INT_GET(sbp->hash, ARCH_CONVERT)) {
...@@ -587,8 +587,7 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context) ...@@ -587,8 +587,7 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
ASSERT(context->flags & ATTR_KERNAMELS); ASSERT(context->flags & ATTR_KERNAMELS);
context->count += namesp->attr_namelen + context->count += namesp->attr_namelen +
sbp->namelen + 1; sbp->namelen + 1;
} } else {
else {
if (xfs_attr_put_listent(context, namesp, if (xfs_attr_put_listent(context, namesp,
sbp->name, sbp->namelen, sbp->name, sbp->namelen,
INT_GET(sbp->valuelen, ARCH_CONVERT))) INT_GET(sbp->valuelen, ARCH_CONVERT)))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment