diff --git a/[refs] b/[refs]
index a60932fe987d..5281aa57b582 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85effe183dd45854d1ad1a370b88cddb403c4c91
+refs/heads/master: 21ec6ffa46719a4ed45531b5b01014c26f0416c4
diff --git a/trunk/fs/ceph/xattr.c b/trunk/fs/ceph/xattr.c
index 785cb3057c95..2c2ae5be9902 100644
--- a/trunk/fs/ceph/xattr.c
+++ b/trunk/fs/ceph/xattr.c
@@ -457,6 +457,7 @@ static int __build_xattrs(struct inode *inode)
 			for (i = 0; i < numattr; i++)
 				kfree(xattrs[i]);
 			kfree(xattrs);
+			xattrs = NULL;
 			goto start;
 		}
 		err = -EIO;