[PATCH 4.4 076/104] xfs: dont fail when converting shortform attr to long form during ATTR_REPLACE
From: Greg Kroah-Hartman
Date: Thu Jan 24 2019 - 14:27:29 EST
4.4-stable review patch. If anyone has any objections, please let me know.
From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
commit 7b38460dc8e4eafba06c78f8e37099d3b34d473c upstream.
Kanda Motohiro reported that expanding a tiny xattr into a large xattr
fails on XFS because we remove the tiny xattr from a shortform fork and
then try to re-add it after converting the fork to extents format having
not removed the ATTR_REPLACE flag. This fails because the attr is no
longer present, causing a fs shutdown.
This is derived from the patch in his bug report, but we really
shouldn't ignore a nonzero retval from the remove call.
Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx>
Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
Cc: Ben Hutchings <ben.hutchings@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
fs/xfs/libxfs/xfs_attr.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
@@ -528,7 +528,14 @@ xfs_attr_shortform_addname(xfs_da_args_t
if (args->flags & ATTR_CREATE)
retval = xfs_attr_shortform_remove(args);
- ASSERT(retval == 0);
+ if (retval)
+ return retval;
+ * Since we have removed the old attr, clear ATTR_REPLACE so
+ * that the leaf format add routine won't trip over the attr
+ * not being around.
+ args->flags &= ~ATTR_REPLACE;
if (args->namelen >= XFS_ATTR_SF_ENTSIZE_MAX ||