diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
| commit | d2f6409584e2c62ffad81690562330ff3bf4a458 (patch) | |
| tree | 3bdfb97d0b51be2f7f414f2107e97603c1206abb /fs/qnx4/dir.c | |
| parent | e1b09eba2686eca94a3a188042b518df6044a3c1 (diff) | |
| parent | 4a89a04f1ee21a7c1f4413f1ad7dcfac50ff9b63 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/qnx4/dir.c')
| -rw-r--r-- | fs/qnx4/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/qnx4/dir.c b/fs/qnx4/dir.c index cd66147cca04..7a8f5595c26f 100644 --- a/fs/qnx4/dir.c +++ b/fs/qnx4/dir.c | |||
| @@ -61,7 +61,7 @@ static int qnx4_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
| 61 | ino = blknum * QNX4_INODES_PER_BLOCK + ix - 1; | 61 | ino = blknum * QNX4_INODES_PER_BLOCK + ix - 1; |
| 62 | else { | 62 | else { |
| 63 | le = (struct qnx4_link_info*)de; | 63 | le = (struct qnx4_link_info*)de; |
| 64 | ino = ( le->dl_inode_blk - 1 ) * | 64 | ino = ( le32_to_cpu(le->dl_inode_blk) - 1 ) * |
| 65 | QNX4_INODES_PER_BLOCK + | 65 | QNX4_INODES_PER_BLOCK + |
| 66 | le->dl_inode_ndx; | 66 | le->dl_inode_ndx; |
| 67 | } | 67 | } |