diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
| commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
| tree | 5085c389f09da78182b899d19fe1068b619a69dd /fs/qnx4 | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'fs/qnx4')
| -rw-r--r-- | fs/qnx4/dir.c | 5 | ||||
| -rw-r--r-- | fs/qnx4/symlinks.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/fs/qnx4/dir.c b/fs/qnx4/dir.c index 8b27142a3..0fbae7262 100644 --- a/fs/qnx4/dir.c +++ b/fs/qnx4/dir.c @@ -41,6 +41,11 @@ static int qnx4_readdir(struct file *filp, void *dirent, filldir_t filldir) while (filp->f_pos < inode->i_size) { bh = bread(inode->i_dev, blknum, QNX4_BLOCK_SIZE); + if(bh==NULL) + { + printk(KERN_ERR "qnx4_readdir: bread failed (%ld)\n", blknum); + break; + } i = (filp->f_pos - (((filp->f_pos >> 6) >> 3) << 9)) & 0x3f; while (i < QNX4_INODES_PER_BLOCK) { offset = i * QNX4_DIR_ENTRY_SIZE; diff --git a/fs/qnx4/symlinks.c b/fs/qnx4/symlinks.c index c360d8b72..0b3f9ae03 100644 --- a/fs/qnx4/symlinks.c +++ b/fs/qnx4/symlinks.c @@ -98,12 +98,12 @@ static int qnx4_readlink(struct dentry *dentry, char *buffer, int buflen) } bh = bread(inode->i_dev, qnx4_ino->i_first_xtnt.xtnt_blk, QNX4_BLOCK_SIZE); - QNX4DEBUG(("qnx4: qnx4_bread sym called -> [%s]\n", - bh->b_data)); if (bh == NULL) { QNX4DEBUG(("qnx4: NULL symlink bh\n")); return 0; } + QNX4DEBUG(("qnx4: qnx4_bread sym called -> [%s]\n", + bh->b_data)); if (bh->b_data[0] != 0) { i = 0; while (i < buflen && (c = bh->b_data[i])) { |