Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/rump/dev/lib/libnetsmb Fix the ATF failures caused by my...



details:   https://anonhg.NetBSD.org/src/rev/f35587902136
branches:  trunk
changeset: 330700:f35587902136
user:      maxv <maxv%NetBSD.org@localhost>
date:      Fri Jul 18 16:25:17 2014 +0000

description:
Fix the ATF failures caused by my recent smbfs change (smbfs_vfsops.c -r1.103).

ok pooka@

diffstat:

 sys/rump/dev/lib/libnetsmb/netsmb_component.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 535d293ee28d -r f35587902136 sys/rump/dev/lib/libnetsmb/netsmb_component.c
--- a/sys/rump/dev/lib/libnetsmb/netsmb_component.c     Fri Jul 18 16:02:50 2014 +0000
+++ b/sys/rump/dev/lib/libnetsmb/netsmb_component.c     Fri Jul 18 16:25:17 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netsmb_component.c,v 1.1 2014/03/13 01:57:29 pooka Exp $       */
+/*     $NetBSD: netsmb_component.c,v 1.2 2014/07/18 16:25:17 maxv Exp $        */
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netsmb_component.c,v 1.1 2014/03/13 01:57:29 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netsmb_component.c,v 1.2 2014/07/18 16:25:17 maxv Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -48,7 +48,8 @@
        int error;
 
        bmaj = cmaj = NODEVMAJOR;
-       if ((error = devsw_attach("nsmb", NULL, &bmaj, &nsmb_cdevsw, &cmaj))!=0)
+       error = devsw_attach("nsmb", NULL, &bmaj, &nsmb_cdevsw, &cmaj);
+       if (error && error != EEXIST)
                panic("nsmb devsw attach failed: %d", error);
        if ((error = rump_vfs_makedevnodes(S_IFCHR, "/dev/nsmb", '0',
            cmaj, 0, 4)) != 0)



Home | Main Index | Thread Index | Old Index