aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2013-08-12 06:49:52 -0400
committerBen Myers <bpm@sgi.com>2013-08-12 17:59:14 -0400
commitcb9eabff58390a22ba8e4b0c838cbf2efb192225 (patch)
tree189ba011986c18a261fa712efb643f8bce007f50 /fs/xfs
parentb49a0c1883899bf9bc6cc5b9c4e6ee5d0f552530 (diff)
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>
Diffstat (limited to 'fs/xfs')
-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(
1586 ents = xfs_dir3_leaf_ents_p(leaf); 1586 ents = xfs_dir3_leaf_ents_p(leaf);
1587 xfs_dir3_leaf_hdr_from_disk(&leafhdr, leaf); 1587 xfs_dir3_leaf_hdr_from_disk(&leafhdr, leaf);
1588 1588
1589#ifndef __KERNEL__
1590 if (!leafhdr.count)
1591 return 0;
1592#endif
1593 /* 1589 /*
1594 * Note, the table cannot be empty, so we have to go through the loop. 1590 * Note, the table cannot be empty, so we have to go through the loop.
1595 * Binary search the leaf entries looking for our hash value. 1591 * Binary search the leaf entries looking for our hash value.