---

yaml --- r: 198044 b: refs/heads/master c: c770807 h: refs/heads/master v: v3
git-mirror · May 17, 2010 · a8d446a · a8d446a
1 parent 4487a23
commit a8d446a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git 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
@@ -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)