diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
| commit | 95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch) | |
| tree | 27a92a942821cde1edda9a1b088718d436b3efe4 /fs/qnx4/dir.c | |
| parent | 45b27b0a0652331d104c953a5b192d843fff88f8 (diff) | |
Merge with Linux 2.3.40.
Diffstat (limited to 'fs/qnx4/dir.c')
| -rw-r--r-- | fs/qnx4/dir.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/qnx4/dir.c b/fs/qnx4/dir.c index 831219999..7dd304735 100644 --- a/fs/qnx4/dir.c +++ b/fs/qnx4/dir.c @@ -37,8 +37,7 @@ static int qnx4_readdir(struct file *filp, void *dirent, filldir_t filldir) while (filp->f_pos < inode->i_size) { blknum = qnx4_block_map( inode, filp->f_pos / QNX4_BLOCK_SIZE ); bh = bread(inode->i_dev, blknum, QNX4_BLOCK_SIZE); - if(bh==NULL) - { + if(bh==NULL) { printk(KERN_ERR "qnx4_readdir: bread failed (%ld)\n", blknum); break; } @@ -57,8 +56,7 @@ static int qnx4_readdir(struct file *filp, void *dirent, filldir_t filldir) QNX4DEBUG(("qnx4_readdir:%.*s\n", size, de->di_fname)); if ( ( de->di_status & QNX4_FILE_LINK ) == 0 ) ino = blknum * QNX4_INODES_PER_BLOCK + ix - 1; - else - { + else { le = (struct qnx4_link_info*)de; ino = ( le->dl_inode_blk - 1 ) * QNX4_INODES_PER_BLOCK + |