diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-05-05 01:08:35 +0200 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-05-05 01:08:35 +0200 |
| commit | 36050271e6ec19390184e1a83470eb7e725cad65 (patch) | |
| tree | ef2c84331d71890e9a68eb63d925d5545cbb4103 /fs | |
| parent | NTFS: Use i_size_read() in fs/ntfs/file.c::ntfs_file_open(). (diff) | |
| parent | Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/j... (diff) | |
| download | linux-36050271e6ec19390184e1a83470eb7e725cad65.tar.xz linux-36050271e6ec19390184e1a83470eb7e725cad65.zip | |
Merge with /usr/src/ntfs-2.6.git
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jfs/jfs_xtree.c | 6 |
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: |