[PATCH] qnx4fs: remove remains of the (defunct) write support

[PATCH] qnx4fs: remove remains of the (defunct) write support

[Anders Larsen]

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

Signed-off-by: Anders Larsen <al@alarsen.net>
---

 fs/qnx4/bitmap.c |    7 -------
 fs/qnx4/inode.c  |   22 +---------------------
 2 files changed, 1 insertions(+), 28 deletions(-)

diff --git a/fs/qnx4/bitmap.c b/fs/qnx4/bitmap.c
index 32f5d13..a17440b 100644
--- a/fs/qnx4/bitmap.c
+++ b/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 --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c
index c406fe1..57ac963 100644
--- 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;
 }

Re: [PATCH] qnx4fs: remove remains of the (defunct) write support

[Jiri Kosina]

On Sat, 26 Sep 2009, Anders Larsen wrote:

> commit 945ffe54bbd56ceed62de3b908800fd7c6ffb284 removed the (defunct)
> write support but missed a chunk of related, dead code.
> 
> Signed-off-by: Anders Larsen <al@alarsen.net>

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

> ---
> 
>  fs/qnx4/bitmap.c |    7 -------
>  fs/qnx4/inode.c  |   22 +---------------------
>  2 files changed, 1 insertions(+), 28 deletions(-)
> 
> diff --git a/fs/qnx4/bitmap.c b/fs/qnx4/bitmap.c
> index 32f5d13..a17440b 100644
> --- a/fs/qnx4/bitmap.c
> +++ b/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 --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c
> index c406fe1..57ac963 100644
> --- 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;
>  }
> 

-- 
Jiri Kosina
SUSE Labs, Novell Inc.