iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/

Browse Source
This commit is contained in:
Linus Torvalds 2005-05-04 14:23:14 -07:00
commit 1d42a0ecf4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/jfs/jfs_xtree.c
View File

@ -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 * 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: