Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/ (1d42a0ec) · Commits · e / devices / android_kernel_xiaomi_nabu

fs/jfs/jfs_xtree.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (C) International Business Machines Corp., 2000-2004		* Copyright (C) International Business Machines Corp., 2000-2005
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	@@ -688,7 +688,7 @@ static int xtSearch(struct inode ip, s64 xoff, s64 nextp,
	/* search hit - internal page:		/* search hit - internal page:
	* descend/search its child page		* descend/search its child page
	*/		*/
	if (index < p->header.nextindex - 1)		if (index < le16_to_cpu(p->header.nextindex)-1)
	next = offsetXAD(&p->xad[index + 1]);		next = offsetXAD(&p->xad[index + 1]);
	goto next;		goto next;
	}		}
	@@ -705,7 +705,7 @@ static int xtSearch(struct inode ip, s64 xoff, s64 nextp,
	* base is the smallest index with key (Kj) greater than		* base is the smallest index with key (Kj) greater than
	* search key (K) and may be zero or maxentry index.		* search key (K) and may be zero or maxentry index.
	*/		*/
	if (base < p->header.nextindex)		if (base < le16_to_cpu(p->header.nextindex))
	next = offsetXAD(&p->xad[base]);		next = offsetXAD(&p->xad[base]);
	/*		/*
	* search miss - leaf page:		* search miss - leaf page: