Please pick: commit 7b38460dc8e4eafba06c78f8e37099d3b34d473c Author: Darrick J. Wong <darrick.wong@xxxxxxxxxx> Date: Tue Apr 17 19:10:15 2018 -0700 xfs: don't fail when converting shortform attr to long form during ATTR_REPLACE for 4.4. It's already present in other stable branches, and I've verified that when applied on 4.4-stable it fixes the reproducer on Bugzilla. Ben. -- Ben Hutchings, Software Developer Codethink Ltd https://www.codethink.co.uk/ Dale House, 35 Dale Street Manchester, M1 2HF, United Kingdom