summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-04 14:23:14 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-04 14:23:14 -0700
commit1d42a0ecf478962e8aede355a0be41365c117ff0 (patch)
tree0b27e168f2c9d6f807f9a78a913583434ea671dd
parent836eeed6cea8ca8138e9deff7571857923541604 (diff)
parent6b6bf51081a27e80334e7ebe2993ae1d046a3222 (diff)
downloadlinux-1d42a0ecf478962e8aede355a0be41365c117ff0.tar.gz
linux-1d42a0ecf478962e8aede355a0be41365c117ff0.tar.bz2
linux-1d42a0ecf478962e8aede355a0be41365c117ff0.zip
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/
-rw-r--r--fs/jfs/jfs_xtree.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/jfs/jfs_xtree.c b/fs/jfs/jfs_xtree.c
index 2c1f311914a1..31b34db4519e 100644
--- a/fs/jfs/jfs_xtree.c
+++ b/fs/jfs/jfs_xtree.c
@@ -1,5 +1,5 @@
/*
- * 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
* 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:
* 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]);
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
* 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]);
/*
* search miss - leaf page: