public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH ISDN] Fix capifs bug in initialization error path.
@ 2005-08-27  3:56 James Morris
  2005-08-27 11:47 ` Karsten Keil
  0 siblings, 1 reply; 3+ messages in thread
From: James Morris @ 2005-08-27  3:56 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-kernel, kkeil, kai.germaschewski

This patch fixes a bug in the capifs initialization code, where the 
filesystem is not unregistered if kern_mount() fails.

Please apply.

Signed-off-by: James Morris <jmorris@namei.org>

---

 capifs.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)


diff -purN -X dontdiff linux-2.6.13-mm2.o/drivers/isdn/capi/capifs.c linux-2.6.13-mm2.x/drivers/isdn/capi/capifs.c
--- linux-2.6.13-mm2.o/drivers/isdn/capi/capifs.c	2005-03-02 02:37:50.000000000 -0500
+++ linux-2.6.13-mm2.x/drivers/isdn/capi/capifs.c	2005-08-26 23:35:50.000000000 -0400
@@ -191,8 +191,10 @@ static int __init capifs_init(void)
 	err = register_filesystem(&capifs_fs_type);
 	if (!err) {
 		capifs_mnt = kern_mount(&capifs_fs_type);
-		if (IS_ERR(capifs_mnt))
+		if (IS_ERR(capifs_mnt)) {
 			err = PTR_ERR(capifs_mnt);
+			unregister_filesystem(&capifs_fs_type);
+		}
 	}
 	if (!err)
 		printk(KERN_NOTICE "capifs: Rev %s\n", rev);

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH ISDN] Fix capifs bug in initialization error path.
  2005-08-27  3:56 [PATCH ISDN] Fix capifs bug in initialization error path James Morris
@ 2005-08-27 11:47 ` Karsten Keil
  2005-08-27 20:59   ` Marcel Holtmann
  0 siblings, 1 reply; 3+ messages in thread
From: Karsten Keil @ 2005-08-27 11:47 UTC (permalink / raw)
  To: James Morris; +Cc: Linus Torvalds, linux-kernel, kai.germaschewski, akpm

On Fri, Aug 26, 2005 at 11:56:56PM -0400, James Morris wrote:
> This patch fixes a bug in the capifs initialization code, where the 
> filesystem is not unregistered if kern_mount() fails.
> 
> Please apply.

looks OK for me.

Signed-off-by: James Morris <jmorris@namei.org>
Signed-off-by: Karsten Keil <kkeil@suse.de>
---

 capifs.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)


diff -purN -X dontdiff linux-2.6.13-mm2.o/drivers/isdn/capi/capifs.c linux-2.6.13-mm2.x/drivers/isdn/capi/capifs.c
--- linux-2.6.13-mm2.o/drivers/isdn/capi/capifs.c	2005-03-02 02:37:50.000000000 -0500
+++ linux-2.6.13-mm2.x/drivers/isdn/capi/capifs.c	2005-08-26 23:35:50.000000000 -0400
@@ -191,8 +191,10 @@ static int __init capifs_init(void)
 	err = register_filesystem(&capifs_fs_type);
 	if (!err) {
 		capifs_mnt = kern_mount(&capifs_fs_type);
-		if (IS_ERR(capifs_mnt))
+		if (IS_ERR(capifs_mnt)) {
 			err = PTR_ERR(capifs_mnt);
+			unregister_filesystem(&capifs_fs_type);
+		}
 	}
 	if (!err)
 		printk(KERN_NOTICE "capifs: Rev %s\n", rev);
-- 
Karsten Keil
SuSE Labs
ISDN development

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH ISDN] Fix capifs bug in initialization error path.
  2005-08-27 11:47 ` Karsten Keil
@ 2005-08-27 20:59   ` Marcel Holtmann
  0 siblings, 0 replies; 3+ messages in thread
From: Marcel Holtmann @ 2005-08-27 20:59 UTC (permalink / raw)
  To: Karsten Keil
  Cc: James Morris, Linus Torvalds, linux-kernel, kai.germaschewski,
	akpm

Hi Karsten,

> > This patch fixes a bug in the capifs initialization code, where the 
> > filesystem is not unregistered if kern_mount() fails.
> > 
> > Please apply.
> 
> looks OK for me.

and what about me idea to remove capifs completely? We have udev now and
thus it is not needed anymore. I stopped compiling and using it a long
time ago.

Regards

Marcel



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2005-08-27 20:59 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-08-27  3:56 [PATCH ISDN] Fix capifs bug in initialization error path James Morris
2005-08-27 11:47 ` Karsten Keil
2005-08-27 20:59   ` Marcel Holtmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox