diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 22:06:10 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 22:06:10 +0000 |
| commit | aba4e552a2f2c1492441acbccedd8e0a4c53f916 (patch) | |
| tree | 23921efb2b4af590160f034a89ff3da2ecca6e47 /fs/qnx4/dir.c | |
| parent | 9e17e1aa1cf1cb497d2f67147a51831888affcf3 (diff) | |
Merge with Linux 2.3.43.
Diffstat (limited to 'fs/qnx4/dir.c')
| -rw-r--r-- | fs/qnx4/dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/qnx4/dir.c b/fs/qnx4/dir.c index 7dd304735..068c56535 100644 --- a/fs/qnx4/dir.c +++ b/fs/qnx4/dir.c @@ -35,13 +35,13 @@ static int qnx4_readdir(struct file *filp, void *dirent, filldir_t filldir) QNX4DEBUG(("filp->f_pos = %ld\n", (long) filp->f_pos)); while (filp->f_pos < inode->i_size) { - blknum = qnx4_block_map( inode, filp->f_pos / QNX4_BLOCK_SIZE ); + blknum = qnx4_block_map( inode, filp->f_pos >> QNX4_BLOCK_SIZE_BITS ); bh = bread(inode->i_dev, blknum, QNX4_BLOCK_SIZE); if(bh==NULL) { printk(KERN_ERR "qnx4_readdir: bread failed (%ld)\n", blknum); break; } - ix = (filp->f_pos / QNX4_DIR_ENTRY_SIZE - (filp->f_pos / QNX4_BLOCK_SIZE) * QNX4_INODES_PER_BLOCK) % QNX4_INODES_PER_BLOCK; + ix = (int)(filp->f_pos >> QNX4_DIR_ENTRY_SIZE_BITS) % QNX4_INODES_PER_BLOCK; while (ix < QNX4_INODES_PER_BLOCK) { offset = ix * QNX4_DIR_ENTRY_SIZE; de = (struct qnx4_inode_entry *) (bh->b_data + offset); |