1 files changed, 5 insertions, 0 deletions

diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index 0263692979ec..72377b77fbd7 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -2657,6 +2657,11 @@ static int ext4_xattr_make_inode_space(handle_t *handle, struct inode *inode,
                 last = IFIRST(header);
                 /* Find the entry best suited to be pushed into EA block */
                 for (; !IS_LAST_ENTRY(last); last = EXT4_XATTR_NEXT(last)) {
+                        /* never move system.data out of the inode */
+                        if ((last->e_name_len == 4) &&
+                            (last->e_name_index == EXT4_XATTR_INDEX_SYSTEM) &&
+                            !memcmp(last->e_name, "data", 4))
+                                continue;
                         total_size = EXT4_XATTR_LEN(last->e_name_len);
                         if (!last->e_value_inum)
                                 total_size += EXT4_XATTR_SIZE(