Module Name: src
Committed By: maxv
Date: Fri Jul 18 16:25:17 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libnetsmb: netsmb_component.c
Log Message:
Fix the ATF failures caused by my recent smbfs change (smbfs_vfsops.c -r1.103).
ok pooka@
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libnetsmb/netsmb_component.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/dev/lib/libnetsmb/netsmb_component.c
diff -u src/sys/rump/dev/lib/libnetsmb/netsmb_component.c:1.1 src/sys/rump/dev/lib/libnetsmb/netsmb_component.c:1.2
--- src/sys/rump/dev/lib/libnetsmb/netsmb_component.c:1.1 Thu Mar 13 01:57:29 2014
+++ src/sys/rump/dev/lib/libnetsmb/netsmb_component.c Fri Jul 18 16:25:17 2014
@@ -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 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV)
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)
