Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-10-25 16:06:52 +0200
committerTakashi Iwai <tiwai@suse.de>2018-10-25 16:06:52 +0200
commit740bf2d8ca00eae3910d2f2d54f355d2b293cfa8 (patch)
tree70c655a567c5c12b9f8a822138b6f8792334ad4c
parentae71040fd5aa5e7ab790b4975c853886508ac870 (diff)
parent23725d009a1b5d5ece3d63935893227dce666f0d (diff)
Merge branch 'users/ailiopoulos/SLE15/for-next' into SLE15
Pull xfs fix from Anthony Iliopoulos
-rw-r--r--patches.fixes/xfs-don-t-fail-when-converting-shortform-attr-to-lon.patch50
-rw-r--r--series.conf1
2 files changed, 51 insertions, 0 deletions
diff --git a/patches.fixes/xfs-don-t-fail-when-converting-shortform-attr-to-lon.patch b/patches.fixes/xfs-don-t-fail-when-converting-shortform-attr-to-lon.patch
new file mode 100644
index 0000000000..d81b2e64f6
--- /dev/null
+++ b/patches.fixes/xfs-don-t-fail-when-converting-shortform-attr-to-lon.patch
@@ -0,0 +1,50 @@
+From: "Darrick J. Wong" <darrick.wong@oracle.com>
+Date: Tue, 17 Apr 2018 19:10:15 -0700
+Subject: xfs: don't fail when converting shortform attr to long form during
+ ATTR_REPLACE
+Patch-mainline: v4.17-rc4
+Git-commit: 7b38460dc8e4eafba06c78f8e37099d3b34d473c
+References: bsc#1105025
+
+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.
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199119
+Reported-by: kanda.motohiro@gmail.com
+Reviewed-by: Dave Chinner <dchinner@redhat.com>
+Reviewed-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
+Acked-by: Anthony Iliopoulos <ailiopoulos@suse.com>
+---
+ fs/xfs/libxfs/xfs_attr.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
+index ce4a34a2751d..35a124400d60 100644
+--- a/fs/xfs/libxfs/xfs_attr.c
++++ b/fs/xfs/libxfs/xfs_attr.c
+@@ -511,7 +511,14 @@ xfs_attr_shortform_addname(xfs_da_args_t *args)
+ if (args->flags & ATTR_CREATE)
+ return retval;
+ 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 ||
+--
+2.16.3
+
diff --git a/series.conf b/series.conf
index 6e4923b2f1..7e2f22e793 100644
--- a/series.conf
+++ b/series.conf
@@ -15321,6 +15321,7 @@
patches.fixes/errseq-Always-report-a-writeback-error-once.patch
patches.fixes/xfs-set-format-back-to-extents-if-xfs_bmap_extents_t.patch
patches.fixes/xfs-prevent-creating-negative-sized-file-via-INSERT_.patch
+ patches.fixes/xfs-don-t-fail-when-converting-shortform-attr-to-lon.patch
patches.drivers/Input-synaptics-rmi4-fix-an-unchecked-out-of-memory-
patches.drivers/Input-leds-fix-out-of-bound-access
patches.drivers/Input-atmel_mxt_ts-add-touchpad-button-mapping-for-S