]> git.karo-electronics.de Git - linux-beck.git/commitdiff
xfs: remove __KERNEL__ check from xfs_dir2_leaf.c
authorDave Chinner <dchinner@redhat.com>
Mon, 12 Aug 2013 10:49:52 +0000 (20:49 +1000)
committerBen Myers <bpm@sgi.com>
Mon, 12 Aug 2013 21:59:14 +0000 (16:59 -0500)
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 <dchinner@redhat.com>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
fs/xfs/xfs_dir2_leaf.c

index 5505edb9b2ff1d8b8c04218a9f4f9dbe6a983c37..591eaf2359193635ade3bf44f8176362a132313c 100644 (file)
@@ -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.