Skip to content

L
linux-davinci-2.6.23
Commit 1d42a0ec authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

parents 836eeed6 6b6bf510
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
fs/jfs/jfs_xtree.c
View file @ 1d42a0ec
/* /*
* 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, ...@@ -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, ...@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment