From fae7f0ab29b601d8e722ddf2f34a2c4922a00ac5 Mon Sep 17 00:00:00 2001 From: Anders Larsen Date: Tue, 15 Dec 2009 16:48:23 -0800 Subject: [PATCH] --- yaml --- r: 176754 b: refs/heads/master c: ca120b20c32ffabf0e1d4319f65360e920fb4fe2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/qnx4/bitmap.c | 7 ------- trunk/fs/qnx4/inode.c | 22 +--------------------- 3 files changed, 2 insertions(+), 29 deletions(-) diff --git a/[refs] b/[refs] index 775d40f4d9f1..63729d357c06 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f65380c07b64b0e45ad5c7d70ca54a9cde1c00db +refs/heads/master: ca120b20c32ffabf0e1d4319f65360e920fb4fe2 diff --git a/trunk/fs/qnx4/bitmap.c b/trunk/fs/qnx4/bitmap.c index 32f5d131a644..a17440bce018 100644 --- a/trunk/fs/qnx4/bitmap.c +++ b/trunk/fs/qnx4/bitmap.c @@ -17,13 +17,6 @@ #include #include "qnx4.h" -#if 0 -int qnx4_new_block(struct super_block *sb) -{ - return 0; -} -#endif /* 0 */ - static void count_bits(register const char *bmPart, register int size, int *const tf) { diff --git a/trunk/fs/qnx4/inode.c b/trunk/fs/qnx4/inode.c index 449f5a66dd34..ebf3440d28ca 100644 --- a/trunk/fs/qnx4/inode.c +++ b/trunk/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; }