Merge git://git.infradead.org/users/dwmw2/spectra-2.6 into work

[cascardo/linux.git] / fs / qnx4 / inode.c

diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c
index 449f5a6..277575d 100644 (file)
--- a/fs/qnx4/inode.c
+++ b/fs/qnx4/inode.c
@@ -64,25 +64,7 @@ static struct buffer_head *qnx4_getblk(struct inode *inode, int nr,
                result = sb_getblk(inode->i_sb, nr);
                return result;
        }
-       if (!create) {
-               return NULL;
-       }
-#if 0
-       tmp = qnx4_new_block(inode->i_sb);
-       if (!tmp) {
-               return NULL;
-       }
-       result = sb_getblk(inode->i_sb, tmp);
-       if (tst) {
-               qnx4_free_block(inode->i_sb, tmp);
-               brelse(result);
-               goto repeat;
-       }
-       tst = tmp;
-#endif
-       inode->i_ctime = CURRENT_TIME_SEC;
-       mark_inode_dirty(inode);
-       return result;
+       return NULL;
 }
 
 struct buffer_head *qnx4_bread(struct inode *inode, int block, int create)
@@ -113,8 +95,6 @@ static int qnx4_get_block( struct inode *inode, sector_t iblock, struct buffer_h
        if ( phys ) {
                // logical block is before EOF
                map_bh(bh, inode->i_sb, phys);
-       } else if ( create ) {
-               // to be done.
        }
        return 0;
 }
@@ -221,7 +201,8 @@ static const char *qnx4_checkroot(struct super_block *sb)
                                rootdir = (struct qnx4_inode_entry *) (bh->b_data + i * QNX4_DIR_ENTRY_SIZE);
                                if (rootdir->di_fname != NULL) {
                                        QNX4DEBUG((KERN_INFO "rootdir entry found : [%s]\n", rootdir->di_fname));
-                                       if (!strncmp(rootdir->di_fname, QNX4_BMNAME, sizeof QNX4_BMNAME)) {
+                                       if (!strcmp(rootdir->di_fname,
+                                                   QNX4_BMNAME)) {
                                                found = 1;
                                                qnx4_sb(sb)->BitMap = kmalloc( sizeof( struct qnx4_inode_entry ), GFP_KERNEL );
                                                if (!qnx4_sb(sb)->BitMap) {