Commit cb9eabff authored Aug 12, 2013 by Dave Chinner Committed by Ben Myers Aug 12, 2013

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>

parent b49a0c18

fs/xfs/xfs_dir2_leaf.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1586,10 +1586,6 @@ xfs_dir2_leaf_search_hash(
	ents = xfs_dir3_leaf_ents_p(leaf);		ents = xfs_dir3_leaf_ents_p(leaf);
	xfs_dir3_leaf_hdr_from_disk(&leafhdr, 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.		* Note, the table cannot be empty, so we have to go through the loop.
	* Binary search the leaf entries looking for our hash value.		* Binary search the leaf entries looking for our hash value.