Skip to contentSkip to conversation

qnx4fs: remove remains of the (defunct) write support

PATCH In review Anders Larsen 2 participants 2 messages Sep 26, 2009 – Oct 9, 2009

Subsystems (2)
lore
Share & tools
lore

Anders Larsen

author maintainer
#0 lore raw

PATCH 1/1 qnx4fs: remove remains of the (defunct) write support

commit 945ffe54bbd56ceed62de3b908800fd7c6ffb284 removed the (defunct) write support but missed a chunk of related, dead code.

---

 fs/qnx4/bitmap.c |    7 -------
 fs/qnx4/inode.c  |   22 +---------------------
 2 files changed, 1 insertions(+), 28 deletions(-)
fs/qnx4/bitmap.c +0 -7
index 32f5d13..a17440b 100644
@@ -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)
 {
fs/qnx4/inode.c +1 -21
index c406fe1..57ac963 100644
@@ -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;
 }
#1 lore raw
Quoted 4 lines · Anders Larsen

commit 945ffe54bbd56ceed62de3b908800fd7c6ffb284 removed the (defunct) write support but missed a chunk of related, dead code.

I don't see this merged in linux-next, adding Andrew.

Quoted 65 lines

---

 fs/qnx4/bitmap.c |    7 -------
 fs/qnx4/inode.c  |   22 +---------------------
 2 files changed, 1 insertions(+), 28 deletions(-)
fs/qnx4/bitmap.c +0 -7
index 32f5d13..a17440b 100644
@@ -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)
 {
fs/qnx4/inode.c +1 -21
index c406fe1..57ac963 100644
@@ -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;
 }
Signature · 2 lines
Jiri Kosina
SUSE Labs, Novell Inc.