__register_binfmt() made void

Just don't pass NULL to it - nobody does, anyway.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/arch/alpha/kernel/binfmt_loader.c b/arch/alpha/kernel/binfmt_loader.c
index 3fcfad4101300ea1a94992022f4b5084d119d0f9..d1f474d1d44d653bb3c37cc9a696b598e1f5a379 100644 (file)
--- a/arch/alpha/kernel/binfmt_loader.c
+++ b/arch/alpha/kernel/binfmt_loader.c
@@ -46,6 +46,7 @@ static struct linux_binfmt loader_format = {
 
 static int __init init_loader_binfmt(void)
 {
-       return insert_binfmt(&loader_format);
+       insert_binfmt(&loader_format);
+       return 0;
 }
 arch_initcall(init_loader_binfmt);

diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
index 39e49091f64841873ee1d79d768aa677832c500f..cdfc8dc43670274299bf77ddf9c832b405c7e9c0 100644 (file)
--- a/arch/x86/ia32/ia32_aout.c
+++ b/arch/x86/ia32/ia32_aout.c
@@ -519,7 +519,8 @@ out:
 
 static int __init init_aout_binfmt(void)
 {
-       return register_binfmt(&aout_format);
+       register_binfmt(&aout_format);
+       return 0;
 }
 
 static void __exit exit_aout_binfmt(void)

diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
index 1ff94054d35aba8a5c0748585006641010a322af..a543364ba29b5e7194af2172ab9b2b1830093f1d 100644 (file)
--- a/fs/binfmt_aout.c
+++ b/fs/binfmt_aout.c
@@ -454,7 +454,8 @@ out:
 
 static int __init init_aout_binfmt(void)
 {
-       return register_binfmt(&aout_format);
+       register_binfmt(&aout_format);
+       return 0;
 }
 
 static void __exit exit_aout_binfmt(void)

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 07d096c49920cf21308480da107a6064a889db47..f8ac4251877e987c2a1150b266f13728bc7ecce5 100644 (file)
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -2077,7 +2077,8 @@ out:
 
 static int __init init_elf_binfmt(void)
 {
-       return register_binfmt(&elf_format);
+       register_binfmt(&elf_format);
+       return 0;
 }
 
 static void __exit exit_elf_binfmt(void)

diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index 30745f459fafb97175206b396ab23cf3c5e3246a..e7afcb67a2d314a7a19bad3d50f4b1e340f78873 100644 (file)
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -91,7 +91,8 @@ static struct linux_binfmt elf_fdpic_format = {
 
 static int __init init_elf_fdpic_binfmt(void)
 {
-       return register_binfmt(&elf_fdpic_format);
+       register_binfmt(&elf_fdpic_format);
+       return 0;
 }
 
 static void __exit exit_elf_fdpic_binfmt(void)

diff --git a/fs/binfmt_em86.c b/fs/binfmt_em86.c
index b8e8b0acf9bd8df4b3ca369a152afbe01cd9d476..2790c7e1912eca0338bf97d470e9ca5b47252159 100644 (file)
--- a/fs/binfmt_em86.c
+++ b/fs/binfmt_em86.c
@@ -100,7 +100,8 @@ static struct linux_binfmt em86_format = {
 
 static int __init init_em86_binfmt(void)
 {
-       return register_binfmt(&em86_format);
+       register_binfmt(&em86_format);
+       return 0;
 }
 
 static void __exit exit_em86_binfmt(void)

diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index 1bffbe0ed7787d96bd8b36cc25d2bd74a1c3572f..68affab8814619d07eae8896d1cdd5c5d2b31f9d 100644 (file)
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -950,7 +950,8 @@ static int load_flat_binary(struct linux_binprm * bprm, struct pt_regs * regs)
 
 static int __init init_flat_binfmt(void)
 {
-       return register_binfmt(&flat_format);
+       register_binfmt(&flat_format);
+       return 0;
 }
 
 /****************************************************************************/

diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index a9198dfd5f8509064c24112b875e61743bb60e51..1ffb60355cae44f1d296ba1b1713afc5365de9c8 100644 (file)
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -726,11 +726,8 @@ static struct file_system_type bm_fs_type = {
 static int __init init_misc_binfmt(void)
 {
        int err = register_filesystem(&bm_fs_type);
-       if (!err) {
-               err = insert_binfmt(&misc_format);
-               if (err)
-                       unregister_filesystem(&bm_fs_type);
-       }
+       if (!err)
+               insert_binfmt(&misc_format);
        return err;
 }
 

diff --git a/fs/binfmt_script.c b/fs/binfmt_script.c
index 396a9884591f5f6a9cc2e7cfa7c80220bf62ef87..d3b8c1f6315554df64d3491b52d83d2a73f4a359 100644 (file)
--- a/fs/binfmt_script.c
+++ b/fs/binfmt_script.c
@@ -105,7 +105,8 @@ static struct linux_binfmt script_format = {
 
 static int __init init_script_binfmt(void)
 {
-       return register_binfmt(&script_format);
+       register_binfmt(&script_format);
+       return 0;
 }
 
 static void __exit exit_script_binfmt(void)

diff --git a/fs/binfmt_som.c b/fs/binfmt_som.c
index cc8560f6c9b06f93aea947744c737b62c19c1eb3..ec15972dd98acfd177065901b7f5c6041b7b16fa 100644 (file)
--- a/fs/binfmt_som.c
+++ b/fs/binfmt_som.c
@@ -289,7 +289,8 @@ static int load_som_library(struct file *f)
 
 static int __init init_som_binfmt(void)
 {
-       return register_binfmt(&som_format);
+       register_binfmt(&som_format);
+       return 0;
 }
 
 static void __exit exit_som_binfmt(void)

diff --git a/fs/exec.c b/fs/exec.c
index 153dee14fe559b9180a2f79b4b1f8534e25c76f5..2c5ae338773cb7a834586f04ae4ef49d6bcd746f 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -79,15 +79,13 @@ static atomic_t call_count = ATOMIC_INIT(1);
 static LIST_HEAD(formats);
 static DEFINE_RWLOCK(binfmt_lock);
 
-int __register_binfmt(struct linux_binfmt * fmt, int insert)
+void __register_binfmt(struct linux_binfmt * fmt, int insert)
 {
-       if (!fmt)
-               return -EINVAL;
+       BUG_ON(!fmt);
        write_lock(&binfmt_lock);
        insert ? list_add(&fmt->lh, &formats) :
                 list_add_tail(&fmt->lh, &formats);
        write_unlock(&binfmt_lock);
-       return 0;       
 }
 
 EXPORT_SYMBOL(__register_binfmt);

diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index 0092102db2de7be71f648d0e1c761530cb8f2b14..366422bc1633cecda39235276569f283faf0bf46 100644 (file)
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -92,17 +92,17 @@ struct linux_binfmt {
        unsigned long min_coredump;     /* minimal dump size */
 };
 
-extern int __register_binfmt(struct linux_binfmt *fmt, int insert);
+extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
 
 /* Registration of default binfmt handlers */
-static inline int register_binfmt(struct linux_binfmt *fmt)
+static inline void register_binfmt(struct linux_binfmt *fmt)
 {
-       return __register_binfmt(fmt, 0);
+       __register_binfmt(fmt, 0);
 }
 /* Same as above, but adds a new binfmt at the top of the list */
-static inline int insert_binfmt(struct linux_binfmt *fmt)
+static inline void insert_binfmt(struct linux_binfmt *fmt)
 {
-       return __register_binfmt(fmt, 1);
+       __register_binfmt(fmt, 1);
 }
 
 extern void unregister_binfmt(struct linux_binfmt *);