From patchwork Thu Jan 13 23:07:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergiy Kibrik X-Patchwork-Id: 476941 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0DNPrwk014697 for ; Thu, 13 Jan 2011 23:25:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757151Ab1AMXZw (ORCPT ); Thu, 13 Jan 2011 18:25:52 -0500 Received: from smtp.meta.ua ([194.0.131.41]:38571 "EHLO smtp.meta.ua" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756883Ab1AMXZv (ORCPT ); Thu, 13 Jan 2011 18:25:51 -0500 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 13 Jan 2011 23:25:57 +0000 (UTC) X-Greylist: delayed 1106 seconds by postgrey-1.27 at vger.kernel.org; Thu, 13 Jan 2011 18:25:51 EST Received: from [79.124.239.120] (port=47002 helo=darkstar.localnet) by webmail.meta.ua with esmtpsa id 1PdWGH-0004Ar-SS by authid ; Fri, 14 Jan 2011 01:07:22 +0200 Subject: [PATCH] ceph: fix xattr search while getxattr From: Sergiy Kibrik Reply-To: sakib@meta.ua To: Sage Weil Cc: ceph-devel@vger.kernel.org Date: Fri, 14 Jan 2011 01:07:02 +0200 MIME-Version: 1.0 Message-Id: <201101140107.02627.sakib@meta.ua> X-HddSpool: 1 X-Gen: 4fc6f66a816b66afb52eb4c23c490240 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c index 6e12a6b..3d1d1d5 100644 --- a/fs/ceph/xattr.c +++ b/fs/ceph/xattr.c @@ -219,13 +219,15 @@ 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 c; + int c, name_len = strlen(name); 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); + c = name_len - xattr->name_len; + if (!c) + c = strncmp(name, xattr->name, xattr->name_len); if (c < 0) p = &(*p)->rb_left; else if (c > 0)