summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2013-08-12 20:49:52 +1000
committerBen Myers <bpm@sgi.com>2013-08-12 16:59:14 -0500
commitcb9eabff58390a22ba8e4b0c838cbf2efb192225 (patch)
tree189ba011986c18a261fa712efb643f8bce007f50
parentb49a0c1883899bf9bc6cc5b9c4e6ee5d0f552530 (diff)
downloadlinux-stable-cb9eabff58390a22ba8e4b0c838cbf2efb192225.tar.gz
linux-stable-cb9eabff58390a22ba8e4b0c838cbf2efb192225.tar.bz2
linux-stable-cb9eabff58390a22ba8e4b0c838cbf2efb192225.zip
xfs: remove __KERNEL__ check from xfs_dir2_leaf.c
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>
-rw-r--r--fs/xfs/xfs_dir2_leaf.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/xfs/xfs_dir2_leaf.c b/fs/xfs/xfs_dir2_leaf.c
index 5505edb9b2ff..591eaf235919 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.