---

yaml --- r: 232521 b: refs/heads/master c: 17db143 h: refs/heads/master i: 232519: ea03b21 v: v3
git-mirror · Jan 13, 2011 · ac12f24 · ac12f24
1 parent 83069f3
commit ac12f24
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c1266bb916e6a6b362d3be95f2cc7f3c41277a6
+refs/heads/master: 17db143fc091238c43ab9f373974ca2224a4c3f8
diff --git a/trunk/fs/ceph/xattr.c b/trunk/fs/ceph/xattr.c
@@ -219,13 +219,16 @@ static struct ceph_inode_xattr *__get_xattr(struct ceph_inode_info *ci,
 	struct rb_node **p;
 	struct rb_node *parent = NULL;
 	struct ceph_inode_xattr *xattr = NULL;
+	int name_len = strlen(name);
 	int c;
 
 	p = &ci->i_xattrs.index.rb_node;
 	while (*p) {
 		parent = *p;
 		xattr = rb_entry(parent, struct ceph_inode_xattr, node);
 		c = strncmp(name, xattr->name, xattr->name_len);
+		if (c == 0 && name_len > xattr->name_len)
+			c = 1;
 		if (c < 0)
 			p = &(*p)->rb_left;
 		else if (c > 0)