From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id 76AB77F72 for ; Fri, 19 Jul 2013 01:25:50 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay1.corp.sgi.com (Postfix) with ESMTP id 671AE8F8035 for ; Thu, 18 Jul 2013 23:25:50 -0700 (PDT) Received: from ipmail06.adl6.internode.on.net (ipmail06.adl6.internode.on.net [150.101.137.145]) by cuda.sgi.com with ESMTP id FNhE96KVgnyAVdYQ for ; Thu, 18 Jul 2013 23:25:49 -0700 (PDT) Received: from disappointment.disaster.area ([192.168.1.110] helo=disappointment) by dastard with esmtp (Exim 4.76) (envelope-from ) id 1V0483-00048w-5Q for xfs@oss.sgi.com; Fri, 19 Jul 2013 16:25:23 +1000 Received: from dave by disappointment with local (Exim 4.80) (envelope-from ) id 1V0483-0001z7-4T for xfs@oss.sgi.com; Fri, 19 Jul 2013 16:25:23 +1000 From: Dave Chinner Subject: [PATCH 31/49] xfs: remove __KERNEL__ check from xfs_dir2_leaf.c Date: Fri, 19 Jul 2013 16:25:02 +1000 Message-Id: <1374215120-7271-32-git-send-email-david@fromorbit.com> In-Reply-To: <1374215120-7271-1-git-send-email-david@fromorbit.com> References: <1374215120-7271-1-git-send-email-david@fromorbit.com> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: xfs@oss.sgi.com From: Dave Chinner It's actually an ifndef section, which means it is only included in userspace. however, it's deep within the libxfs code, so it's unlikely that the condition checked in userspace can actually occur (search an empty leaf) through the libxfs interfaces. i.e. if it can happen in usrspace, it can happen in the kernel, so remove it from userspace too.... Signed-off-by: Dave Chinner --- fs/xfs/xfs_dir2_leaf.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/fs/xfs/xfs_dir2_leaf.c b/fs/xfs/xfs_dir2_leaf.c index 5505edb..591eaf2 100644 --- a/fs/xfs/xfs_dir2_leaf.c +++ b/fs/xfs/xfs_dir2_leaf.c @@ -1586,10 +1586,6 @@ xfs_dir2_leaf_search_hash( ents = xfs_dir3_leaf_ents_p(leaf); xfs_dir3_leaf_hdr_from_disk(&leafhdr, leaf); -#ifndef __KERNEL__ - if (!leafhdr.count) - return 0; -#endif /* * Note, the table cannot be empty, so we have to go through the loop. * Binary search the leaf entries looking for our hash value. -- 1.8.3.2 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs