Skip to contentSkip to conversation

QNX4 cleanups

PATCH In review Adrian Bunk 3 participants 5 messages Oct 30, 2004

Subsystems (2)
VFS QNX4 filesystem
lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 QNX4 cleanups

The patch below does the following cleanups in the QNX4 fs:
- remove two unused global functions
- make some functions static

diffstat output:

 fs/qnx4/bitmap.c        |   58 ----------------------------------------
 fs/qnx4/inode.c         |    6 ++--
 include/linux/qnx4_fs.h |    4 --
 3 files changed, 4 insertions(+), 64 deletions(-)
Signed-off-by Adrian Bunk <[email protected]>
include/linux/qnx4_fs.h renamed from include/linux/qnx4_fs.h.old +0 -4
@@ -114,15 +114,12 @@
 extern unsigned long qnx4_count_free_blocks(struct super_block *sb);
 extern unsigned long qnx4_block_map(struct inode *inode, long iblock);
 
-extern struct buffer_head *qnx4_getblk(struct inode *, int, int);
 extern struct buffer_head *qnx4_bread(struct inode *, int, int);
 
 extern struct inode_operations qnx4_file_inode_operations;
 extern struct inode_operations qnx4_dir_inode_operations;
 extern struct file_operations qnx4_file_operations;
 extern struct file_operations qnx4_dir_operations;
-extern int qnx4_is_free(struct super_block *sb, long block);
-extern int qnx4_set_bitmap(struct super_block *sb, long block, int busy);
 extern int qnx4_create(struct inode *inode, struct dentry *dentry, int mode, struct nameidata *nd);
 extern void qnx4_truncate(struct inode *inode);
 extern void qnx4_free_inode(struct inode *inode);

@@ -130,7 +127,6 @@
 extern int qnx4_rmdir(struct inode *dir, struct dentry *dentry);
 extern int qnx4_sync_file(struct file *file, struct dentry *dentry, int);
 extern int qnx4_sync_inode(struct inode *inode);
-extern int qnx4_get_block(struct inode *inode, sector_t iblock, struct buffer_head *bh, int create);
 
 static inline struct qnx4_sb_info *qnx4_sb(struct super_block *sb)
 {
fs/qnx4/inode.c renamed from fs/qnx4/inode.c.old +3 -3
@@ -162,7 +162,7 @@
 	return 0;
 }
 
-struct buffer_head *qnx4_getblk(struct inode *inode, int nr,
+static struct buffer_head *qnx4_getblk(struct inode *inode, int nr,
 				 int create)
 {
 	struct buffer_head *result = NULL;

@@ -212,7 +212,7 @@
 	return NULL;
 }
 
-int qnx4_get_block( struct inode *inode, sector_t iblock, struct buffer_head *bh, int create )
+static int qnx4_get_block( struct inode *inode, sector_t iblock, struct buffer_head *bh, int create )
 {
 	unsigned long phys;
 

@@ -447,7 +447,7 @@
 {
 	return generic_block_bmap(mapping,block,qnx4_get_block);
 }
-struct address_space_operations qnx4_aops = {
+static struct address_space_operations qnx4_aops = {
 	.readpage	= qnx4_readpage,
 	.writepage	= qnx4_writepage,
 	.sync_page	= block_sync_page,
fs/qnx4/bitmap.c renamed from fs/qnx4/bitmap.c.old +1 -57

70 lines not on this page · raw message

#1 lore raw
Quoted 3 lines · Adrian Bunk

The patch below does the following cleanups in the QNX4 fs:
- remove two unused global functions
- make some functions static

How about you read the code before doing that?

maintainer
#2 lore raw
Quoted 2 lines · Adrian Bunk

The patch below does the following cleanups in the QNX4 fs:
- remove two unused global functions

If you remove any code inside the #ifdef CONFIG_QNX4FS_RW we might as well remove the option "config QNX4FS_RW" altogether. It's horribly broken, and I don't intend to fix it; while I was thinking about how to properly implement write-support, somebody else went away and did it. As that alternative seems to work well and is being actively maintained, I won't try to reinvent it.

Cheers
Anders

author
#3 lore raw

PATCH 1/1 mark QNX4FS_RW as BROKEN

Quoted 10 lines · Anders Larsen
Quoted 2 lines · Adrian Bunk

The patch below does the following cleanups in the QNX4 fs:
- remove two unused global functions

If you remove any code inside the #ifdef CONFIG_QNX4FS_RW we might as well remove the option "config QNX4FS_RW" altogether. It's horribly broken, and I don't intend to fix it; while I was thinking about how to properly implement write-support, somebody else went away and did it. As that alternative seems to work well and is being actively maintained, I won't try to reinvent it.

OK, I understand why my patch wasn't good.

What about the following to mark it as BROKEN in the Kconfig file?

Signed-off-by Adrian Bunk <[email protected]>
fs/Kconfig renamed from fs/Kconfig.old +1 -1
@@ -1353,7 +1353,7 @@
 
 config QNX4FS_RW
 	bool "QNX4FS write support (DANGEROUS)"
-	depends on QNX4FS_FS && EXPERIMENTAL
+	depends on QNX4FS_FS && EXPERIMENTAL && BROKEN
 	help
 	  Say Y if you want to test write support for QNX4 file systems.
maintainer
#4 lore raw

Re: [2.6 patch] mark QNX4FS_RW as BROKEN

Quoted 1 line · Adrian Bunk

What about the following to mark it as BROKEN in the Kconfig file?

OK