From 8ac25684e289bbb1c52f99b77ac660fcaaf0354f Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 11 Dec 2012 03:31:49 -0500
Subject: [PATCH] --- yaml --- r: 344901 b: refs/heads/master c:
 bd9926e80330d43f15b710c2935fa41b792d56fd h: refs/heads/master i:   344899:
 010e72a779f6b404dd6255b7a61d6a0c27acc0c7 v: v3

---
 [refs]                 |  2 +-
 trunk/fs/ext4/inline.c |  2 +-
 trunk/fs/ext4/xattr.c  | 22 ++++++++++++++++------
 trunk/fs/ext4/xattr.h  |  1 +
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index c8a99f407169..ae1b3281760a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a4c8019471386c6fb039ae9e30f5216b6b55a9e
+refs/heads/master: bd9926e80330d43f15b710c2935fa41b792d56fd
diff --git a/trunk/fs/ext4/inline.c b/trunk/fs/ext4/inline.c
index 53b2f65091dd..387c47c6cda9 100644
--- a/trunk/fs/ext4/inline.c
+++ b/trunk/fs/ext4/inline.c
@@ -268,7 +268,7 @@ static int ext4_create_inline_data(handle_t *handle,
 		goto out;
 
 	if (len > EXT4_MIN_INLINE_DATA_SIZE) {
-		value = (void *)empty_zero_page;
+		value = EXT4_ZERO_XATTR_VALUE;
 		len -= EXT4_MIN_INLINE_DATA_SIZE;
 	} else {
 		value = "";
diff --git a/trunk/fs/ext4/xattr.c b/trunk/fs/ext4/xattr.c
index 2251769a3c53..3a91ebc2b66f 100644
--- a/trunk/fs/ext4/xattr.c
+++ b/trunk/fs/ext4/xattr.c
@@ -628,9 +628,14 @@ ext4_xattr_set_entry(struct ext4_xattr_info *i, struct ext4_xattr_search *s)
 				   size. Just replace. */
 				s->here->e_value_size =
 					cpu_to_le32(i->value_len);
-				memset(val + size - EXT4_XATTR_PAD, 0,
-				       EXT4_XATTR_PAD); /* Clear pad bytes. */
-				memcpy(val, i->value, i->value_len);
+				if (i->value == EXT4_ZERO_XATTR_VALUE) {
+					memset(val, 0, size);
+				} else {
+					/* Clear pad bytes first. */
+					memset(val + size - EXT4_XATTR_PAD, 0,
+					       EXT4_XATTR_PAD);
+					memcpy(val, i->value, i->value_len);
+				}
 				return 0;
 			}
 
@@ -669,9 +674,14 @@ ext4_xattr_set_entry(struct ext4_xattr_info *i, struct ext4_xattr_search *s)
 			size_t size = EXT4_XATTR_SIZE(i->value_len);
 			void *val = s->base + min_offs - size;
 			s->here->e_value_offs = cpu_to_le16(min_offs - size);
-			memset(val + size - EXT4_XATTR_PAD, 0,
-			       EXT4_XATTR_PAD); /* Clear the pad bytes. */
-			memcpy(val, i->value, i->value_len);
+			if (i->value == EXT4_ZERO_XATTR_VALUE) {
+				memset(val, 0, size);
+			} else {
+				/* Clear the pad bytes first. */
+				memset(val + size - EXT4_XATTR_PAD, 0,
+				       EXT4_XATTR_PAD);
+				memcpy(val, i->value, i->value_len);
+			}
 		}
 	}
 	return 0;
diff --git a/trunk/fs/ext4/xattr.h b/trunk/fs/ext4/xattr.h
index 7b5513ed3b38..69eda787a96a 100644
--- a/trunk/fs/ext4/xattr.h
+++ b/trunk/fs/ext4/xattr.h
@@ -71,6 +71,7 @@ struct ext4_xattr_entry {
 #define BFIRST(bh) ENTRY(BHDR(bh)+1)
 #define IS_LAST_ENTRY(entry) (*(__u32 *)(entry) == 0)
 
+#define EXT4_ZERO_XATTR_VALUE ((void *)-1)
 
 struct ext4_xattr_info {
 	int name_index;