The patch titled qnx4fs: remove remains of the (defunct) write support has been removed from the -mm tree. Its filename was qnx4fs-remove-remains-of-the-defunct-write-support.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: qnx4fs: remove remains of the (defunct) write support From: Anders Larsen <al@xxxxxxxxxxx> commit 945ffe54bbd56ceed62de3b908800fd7c6ffb284 ("qnx4: remove write support") removed the (defunct) write support but missed a chunk of related, dead code. Signed-off-by: Anders Larsen <al@xxxxxxxxxxx> Cc: Jiri Kosina <jkosina@xxxxxxx> Acked-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/qnx4/bitmap.c | 7 ------- fs/qnx4/inode.c | 22 +--------------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff -puN fs/qnx4/bitmap.c~qnx4fs-remove-remains-of-the-defunct-write-support fs/qnx4/bitmap.c --- a/fs/qnx4/bitmap.c~qnx4fs-remove-remains-of-the-defunct-write-support +++ a/fs/qnx4/bitmap.c @@ -17,13 +17,6 @@ #include <linux/bitops.h> #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 -puN fs/qnx4/inode.c~qnx4fs-remove-remains-of-the-defunct-write-support fs/qnx4/inode.c --- a/fs/qnx4/inode.c~qnx4fs-remove-remains-of-the-defunct-write-support +++ a/fs/qnx4/inode.c @@ -64,25 +64,7 @@ static struct buffer_head *qnx4_getblk(s 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 if ( phys ) { // logical block is before EOF map_bh(bh, inode->i_sb, phys); - } else if ( create ) { - // to be done. } return 0; } _ Patches currently in -mm which might be from al@xxxxxxxxxxx are origin.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html