From a8d446a1b58a86416e1a89fe11301f1c435e2011 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Sat, 20 Mar 2010 16:01:27 +0300
Subject: [PATCH] --- yaml --- r: 198044 b: refs/heads/master c:
 c7708075f18086ee7d02df8b891910893e9ea372 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/ceph/xattr.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 04d106487028..ec85e1b02cbd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 104648ad3f2ebe8556c020e5f0344853076cd5ee
+refs/heads/master: c7708075f18086ee7d02df8b891910893e9ea372
diff --git a/trunk/fs/ceph/xattr.c b/trunk/fs/ceph/xattr.c
index 8938934c4c93..d940d14f6922 100644
--- a/trunk/fs/ceph/xattr.c
+++ b/trunk/fs/ceph/xattr.c
@@ -186,12 +186,6 @@ static int __set_xattr(struct ceph_inode_info *ci,
 		ci->i_xattrs.names_size -= xattr->name_len;
 		ci->i_xattrs.vals_size -= xattr->val_len;
 	}
-	if (!xattr) {
-		pr_err("__set_xattr ENOMEM on %p %llx.%llx xattr %s=%s\n",
-		       &ci->vfs_inode, ceph_vinop(&ci->vfs_inode), name,
-		       xattr->val);
-		return -ENOMEM;
-	}
 	ci->i_xattrs.names_size += name_len;
 	ci->i_xattrs.vals_size += val_len;
 	if (val)