kill fatfs_syms.c

PATCH In review Adrian Bunk 3 participants 4 messages Oct 30, 2004 – Oct 31, 2004 VFAT/FAT/msdos filesystem

lore

Share & tools

lore

Adrian Bunk

author

2004-10-30 01:52 UTC #0 lore raw

PATCH 1/1 kill fatfs_syms.c

The patch below removes fatfs_syms.c

All EXPORT_SYMBOL's are moved to the files where the actual functions are.

module_{inite,exit} are moved to a new init.c

diffstat output:

 fs/fat/Makefile     |    2 -
 fs/fat/dir.c        |   11 ++++++++++
 fs/fat/fatfs_syms.c |   48 --------------------------------------------
 fs/fat/init.c       |   33 ++++++++++++++++++++++++++++++
 fs/fat/inode.c      |   11 ++++++++++
 fs/fat/misc.c       |    4 +++
 6 files changed, 60 insertions(+), 49 deletions(-)

Signed-off-by Adrian Bunk <[email protected]>

fs/fat/fatfs_syms.c deleted +0 ~~-48~~

@@ -1,48 +0,0 @@
-/*
- * linux/fs/fat/fatfs_syms.c
- *
- * Exported kernel symbols for the low-level FAT-based fs support.
- *
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-
-#include <linux/mm.h>
-#include <linux/msdos_fs.h>
-
-EXPORT_SYMBOL(fat_new_dir);
-EXPORT_SYMBOL(fat_date_unix2dos);
-EXPORT_SYMBOL(fat__get_entry);
-EXPORT_SYMBOL(fat_notify_change);
-EXPORT_SYMBOL(fat_attach);
-EXPORT_SYMBOL(fat_detach);
-EXPORT_SYMBOL(fat_build_inode);
-EXPORT_SYMBOL(fat_fill_super);
-EXPORT_SYMBOL(fat_search_long);
-EXPORT_SYMBOL(fat_scan);
-EXPORT_SYMBOL(fat_add_entries);
-EXPORT_SYMBOL(fat_dir_empty);
-
-int __init fat_cache_init(void);
-void __exit fat_cache_destroy(void);
-int __init fat_init_inodecache(void);
-void __exit fat_destroy_inodecache(void);
-static int __init init_fat_fs(void)
-{
-	int ret;
-
-	ret = fat_cache_init();
-	if (ret < 0)
-		return ret;
-	return fat_init_inodecache();
-}
-
-static void __exit exit_fat_fs(void)
-{
-	fat_cache_destroy();
-	fat_destroy_inodecache();
-}
-
-module_init(init_fat_fs)
-module_exit(exit_fat_fs)

fs/fat/init.c new file +33 -0

@@ -0,0 +1,33 @@
+/*
+ * linux/fs/fat/init.c
+ *
+ * init/exit functions for FAT
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+
+int __init fat_cache_init(void);
+void __exit fat_cache_destroy(void);
+int __init fat_init_inodecache(void);
+void __exit fat_destroy_inodecache(void);
+
+static int __init init_fat_fs(void)
+{
+	int ret;
+
+	ret = fat_cache_init();
+	if (ret < 0)
+		return ret;
+	return fat_init_inodecache();
+}
+
+static void __exit exit_fat_fs(void)
+{
+	fat_cache_destroy();
+	fat_destroy_inodecache();
+}
+
+module_init(init_fat_fs)
+module_exit(exit_fat_fs)

fs/fat/Makefile renamed from fs/fat/Makefile.old +1 -1

@@ -4,4 +4,4 @@
 
 obj-$(CONFIG_FAT_FS) += fat.o
 
-fat-objs := cache.o dir.o file.o inode.o misc.o fatfs_syms.o
+fat-objs := cache.o dir.o file.o inode.o misc.o init.o

fs/fat/dir.c renamed from fs/fat/dir.c.old +11 -0

@@ -13,6 +13,7 @@
  *  Short name translation 1999, 2001 by Wolfram Pienkoss <[email protected]>
  */
 
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/msdos_fs.h>

@@ -325,6 +326,8 @@
 	return res;
 }
 
+EXPORT_SYMBOL(fat_search_long);
+
 static int fat_readdirx(struct inode *inode, struct file *filp, void *dirent,
 			filldir_t filldir, int shortnames, int both)
 {

@@ -714,6 +717,8 @@
 	return offset;
 }
 
+EXPORT_SYMBOL(fat_add_entries);
+
 int fat_new_dir(struct inode *dir, struct inode *parent, int is_vfat)
 {
 	struct buffer_head *bh;

@@ -749,6 +754,8 @@
 	return 0;
 }
 
+EXPORT_SYMBOL(fat_new_dir);
+
 static int fat_get_short_entry(struct inode *dir, loff_t *pos,
 			       struct buffer_head **bh,
 			       struct msdos_dir_entry **de, loff_t *i_pos)

@@ -782,6 +789,8 @@
 	return result;
 }
 
+EXPORT_SYMBOL(fat_dir_empty);
+
 /*
  * fat_subdirs counts the number of sub-directories of dir. It can be run
  * on directories being created.

@@ -821,3 +830,5 @@
 	}
 	return -ENOENT;
 }
+
+EXPORT_SYMBOL(fat_scan);

fs/fat/misc.c renamed from fs/fat/misc.c.old +4 -0

@@ -6,6 +6,7 @@
  *		 and date_dos2unix for date==0 by Igor Zhbanov([email protected])
  */
 
+#include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/msdos_fs.h>
 #include <linux/buffer_head.h>

@@ -272,6 +273,7 @@
 	*date = cpu_to_le16(nl_day-day_n[month-1]+1+(month << 5)+(year << 9));
 }
 
+EXPORT_SYMBOL(fat_date_unix2dos);
 
 /* Returns the inode number of the directory entry at offset pos. If bh is
    non-NULL, it is brelse'd before. Pos is incremented. The buffer header is

@@ -320,3 +322,5 @@
 
 	return 0;
 }
+
+EXPORT_SYMBOL(fat__get_entry);

fs/fat/inode.c renamed from fs/fat/inode.c.old +11 -0

@@ -87,6 +87,8 @@
 	spin_unlock(&sbi->inode_hash_lock);
 }
 
+EXPORT_SYMBOL(fat_attach);
+
 void fat_detach(struct inode *inode)
 {
 	struct msdos_sb_info *sbi = MSDOS_SB(inode->i_sb);

@@ -96,6 +98,8 @@
 	spin_unlock(&sbi->inode_hash_lock);
 }
 
+EXPORT_SYMBOL(fat_detach);
+
 struct inode *fat_iget(struct super_block *sb, loff_t i_pos)
 {
 	struct msdos_sb_info *sbi = MSDOS_SB(sb);

@@ -145,6 +149,8 @@
 	return inode;
 }
 
+EXPORT_SYMBOL(fat_build_inode);
+
 static void fat_delete_inode(struct inode *inode)
 {
 	if (!is_bad_inode(inode)) {

@@ -1070,6 +1076,8 @@
 	return error;
 }
 
+EXPORT_SYMBOL(fat_fill_super);
+
 static int fat_statfs(struct super_block *sb, struct kstatfs *buf)
 {
 	int free, nr, ret;

@@ -1328,4 +1336,7 @@
 	unlock_kernel();
 	return error;
 }
+
+EXPORT_SYMBOL(fat_notify_change);
+
 MODULE_LICENSE("GPL");

Christoph Hellwig

2004-10-30 06:39 UTC #1 lore raw

Quoted 26 lines

fs/fat/init.c new file +23 -0

@@ -0,0 +1,33 @@
+/*
+ * linux/fs/fat/init.c
+ *
+ * init/exit functions for FAT
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+
+int __init fat_cache_init(void);
+void __exit fat_cache_destroy(void);
+int __init fat_init_inodecache(void);
+void __exit fat_destroy_inodecache(void);
+
+static int __init init_fat_fs(void)
+{
+	int ret;
+
+	ret = fat_cache_init();
+	if (ret < 0)
+		return ret;
+	return fat_init_inodecache();

fs/fat/init.c line 33

Quoted 10 lines

fs/fat/init.c new file +10 -0

+}
+
+static void __exit exit_fat_fs(void)
+{
+	fat_cache_destroy();
+	fat_destroy_inodecache();
+}
+
+module_init(init_fat_fs)
+module_exit(exit_fat_fs)

just move this to inode.c

Adrian Bunk

author

2004-10-30 21:36 UTC #2 lore raw

Quoted 2 lines · Christoph Hellwig

...
just move this to inode.c

Thanks for this suggestion.
An updated patch is below.

diffstat output:

 fs/fat/Makefile     |    2 -
 fs/fat/dir.c        |   11 ++++++++++
 fs/fat/fatfs_syms.c |   48 --------------------------------------------
 fs/fat/inode.c      |   35 ++++++++++++++++++++++++++++++++
 fs/fat/misc.c       |    4 +++
 5 files changed, 51 insertions(+), 49 deletions(-)

Signed-off-by Adrian Bunk <[email protected]>

fs/fat/fatfs_syms.c deleted +0 ~~-48~~

@@ -1,48 +0,0 @@
-/*
- * linux/fs/fat/fatfs_syms.c
- *
- * Exported kernel symbols for the low-level FAT-based fs support.
- *
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-
-#include <linux/mm.h>
-#include <linux/msdos_fs.h>
-
-EXPORT_SYMBOL(fat_new_dir);
-EXPORT_SYMBOL(fat_date_unix2dos);
-EXPORT_SYMBOL(fat__get_entry);
-EXPORT_SYMBOL(fat_notify_change);
-EXPORT_SYMBOL(fat_attach);
-EXPORT_SYMBOL(fat_detach);
-EXPORT_SYMBOL(fat_build_inode);
-EXPORT_SYMBOL(fat_fill_super);
-EXPORT_SYMBOL(fat_search_long);
-EXPORT_SYMBOL(fat_scan);
-EXPORT_SYMBOL(fat_add_entries);
-EXPORT_SYMBOL(fat_dir_empty);
-
-int __init fat_cache_init(void);
-void __exit fat_cache_destroy(void);
-int __init fat_init_inodecache(void);
-void __exit fat_destroy_inodecache(void);
-static int __init init_fat_fs(void)
-{
-	int ret;
-
-	ret = fat_cache_init();
-	if (ret < 0)
-		return ret;
-	return fat_init_inodecache();
-}
-
-static void __exit exit_fat_fs(void)
-{
-	fat_cache_destroy();
-	fat_destroy_inodecache();
-}
-
-module_init(init_fat_fs)
-module_exit(exit_fat_fs)

fs/fat/dir.c renamed from fs/fat/dir.c.old +11 -0

@@ -13,6 +13,7 @@
  *  Short name translation 1999, 2001 by Wolfram Pienkoss <[email protected]>
  */
 
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/msdos_fs.h>

@@ -325,6 +326,8 @@
 	return res;
 }
 
+EXPORT_SYMBOL(fat_search_long);
+
 static int fat_readdirx(struct inode *inode, struct file *filp, void *dirent,
 			filldir_t filldir, int shortnames, int both)
 {

@@ -714,6 +717,8 @@
 	return offset;
 }
 
+EXPORT_SYMBOL(fat_add_entries);
+
 int fat_new_dir(struct inode *dir, struct inode *parent, int is_vfat)
 {
 	struct buffer_head *bh;

@@ -749,6 +754,8 @@
 	return 0;
 }
 
+EXPORT_SYMBOL(fat_new_dir);
+
 static int fat_get_short_entry(struct inode *dir, loff_t *pos,
 			       struct buffer_head **bh,
 			       struct msdos_dir_entry **de, loff_t *i_pos)

@@ -782,6 +789,8 @@
 	return result;
 }
 
+EXPORT_SYMBOL(fat_dir_empty);
+
 /*
  * fat_subdirs counts the number of sub-directories of dir. It can be run
  * on directories being created.

@@ -821,3 +830,5 @@
 	}
 	return -ENOENT;
 }
+
+EXPORT_SYMBOL(fat_scan);

fs/fat/misc.c renamed from fs/fat/misc.c.old +4 -0

@@ -6,6 +6,7 @@
  *		 and date_dos2unix for date==0 by Igor Zhbanov([email protected])
  */
 
+#include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/msdos_fs.h>
 #include <linux/buffer_head.h>

@@ -272,6 +273,7 @@
 	*date = cpu_to_le16(nl_day-day_n[month-1]+1+(month << 5)+(year << 9));
 }
 
+EXPORT_SYMBOL(fat_date_unix2dos);
 
 /* Returns the inode number of the directory entry at offset pos. If bh is
    non-NULL, it is brelse'd before. Pos is incremented. The buffer header is

@@ -320,3 +322,5 @@
 
 	return 0;
 }
+
+EXPORT_SYMBOL(fat__get_entry);

fs/fat/Makefile renamed from fs/fat/Makefile.old +1 -1

@@ -4,4 +4,4 @@
 
 obj-$(CONFIG_FAT_FS) += fat.o
 
-fat-objs := cache.o dir.o file.o inode.o misc.o fatfs_syms.o
+fat-objs := cache.o dir.o file.o inode.o misc.o

fs/fat/inode.c renamed from fs/fat/inode.c.old +35 -0

@@ -11,6 +11,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/init.h>
 #include <linux/time.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>

@@ -87,6 +88,8 @@
 	spin_unlock(&sbi->inode_hash_lock);
 }
 
+EXPORT_SYMBOL(fat_attach);
+
 void fat_detach(struct inode *inode)
 {
 	struct msdos_sb_info *sbi = MSDOS_SB(inode->i_sb);

@@ -96,6 +99,8 @@
 	spin_unlock(&sbi->inode_hash_lock);
 }
 
+EXPORT_SYMBOL(fat_detach);
+
 struct inode *fat_iget(struct super_block *sb, loff_t i_pos)
 {
 	struct msdos_sb_info *sbi = MSDOS_SB(sb);

@@ -145,6 +150,8 @@
 	return inode;
 }
 
+EXPORT_SYMBOL(fat_build_inode);
+
 static void fat_delete_inode(struct inode *inode)
 {
 	if (!is_bad_inode(inode)) {

@@ -1070,6 +1077,8 @@
 	return error;
 }
 
+EXPORT_SYMBOL(fat_fill_super);
+
 static int fat_statfs(struct super_block *sb, struct kstatfs *buf)
 {
 	int free, nr, ret;

@@ -1328,4 +1336,30 @@
 	unlock_kernel();
 	return error;
 }
+EXPORT_SYMBOL(fat_notify_change);
+
+
+int __init fat_cache_init(void);
+void __exit fat_cache_destroy(void);
+
+static int __init init_fat_fs(void)
+{
+	int ret;
+
+	ret = fat_cache_init();
+	if (ret < 0)
+		return ret;
+	return fat_init_inodecache();
+}
+
+static void __exit exit_fat_fs(void)
+{
+	fat_cache_destroy();
+	fat_destroy_inodecache();
+}
+
+module_init(init_fat_fs)
+module_exit(exit_fat_fs)
+
+
 MODULE_LICENSE("GPL");

OGAWA Hirofumi

maintainer

2004-10-31 03:27 UTC #3 lore raw

Quoted 6 lines · Adrian Bunk

Quoted 2 lines · Christoph Hellwig
...
just move this to inode.c
Thanks for this suggestion.
An updated patch is below.

Thanks. I'll submit after 2.6.10.

Signature · 1 line

OGAWA Hirofumi <[email protected]>