CVS commit: src/sys/fs

[Mindaugas Rasiukevicius]

Module Name:    src
Committed By:   rmind
Date:           Thu Jun  9 02:59:22 UTC 2011

Modified Files:
        src/sys/fs/filecorefs: filecore_vfsops.c
        src/sys/fs/smbfs: smbfs_subr.c

Log Message:
Remove few references to simple_lock.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/fs/filecorefs/filecore_vfsops.c
cvs rdiff -u -r1.14 -r1.15 src/sys/fs/smbfs/smbfs_subr.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/fs/filecorefs/filecore_vfsops.c
diff -u src/sys/fs/filecorefs/filecore_vfsops.c:1.65 src/sys/fs/filecorefs/filecore_vfsops.c:1.66
--- src/sys/fs/filecorefs/filecore_vfsops.c:1.65	Mon May 23 22:00:31 2011
+++ src/sys/fs/filecorefs/filecore_vfsops.c	Thu Jun  9 02:59:22 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: filecore_vfsops.c,v 1.65 2011/05/23 22:00:31 rmind Exp $	*/
+/*	$NetBSD: filecore_vfsops.c,v 1.66 2011/06/09 02:59:22 rmind Exp $	*/
 
 /*-
  * Copyright (c) 1994 The Regents of the University of California.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filecore_vfsops.c,v 1.65 2011/05/23 22:00:31 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filecore_vfsops.c,v 1.66 2011/06/09 02:59:22 rmind Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -216,9 +216,9 @@
 		vfs_destroy(mp);
 		return (error);
 	}
-	simple_lock(&mountlist_slock);
+	mutex_enter(&mountlist_lock);
 	CIRCLEQ_INSERT_TAIL(&mountlist, mp, mnt_list);
-	simple_unlock(&mountlist_slock);
+	mutex_exit(&mountlist_lock);
 	(void)filecore_statvfs(mp, &mp->mnt_stat, p);
 	vfs_unbusy(mp, false, NULL);
 	return (0);

Index: src/sys/fs/smbfs/smbfs_subr.c
diff -u src/sys/fs/smbfs/smbfs_subr.c:1.14 src/sys/fs/smbfs/smbfs_subr.c:1.15
--- src/sys/fs/smbfs/smbfs_subr.c:1.14	Sat Jun 30 09:37:57 2007
+++ src/sys/fs/smbfs/smbfs_subr.c	Thu Jun  9 02:59:22 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: smbfs_subr.c,v 1.14 2007/06/30 09:37:57 pooka Exp $	*/
+/*	$NetBSD: smbfs_subr.c,v 1.15 2011/06/09 02:59:22 rmind Exp $	*/
 
 /*
  * Copyright (c) 2000-2001, Boris Popov
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbfs_subr.c,v 1.14 2007/06/30 09:37:57 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_subr.c,v 1.15 2011/06/09 02:59:22 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -268,11 +268,11 @@
 	struct smbnode **npp = smp->sm_npstack;
 	int i, error = 0;
 
-/*	simple_lock(&smp->sm_npslock);*/
+/*	mutex_enter(&smp->sm_npslock);*/
 	i = 0;
 	while (np->n_parent) {
 		if (i++ == SMBFS_MAXPATHCOMP) {
-/*			simple_unlock(&smp->sm_npslock);*/
+/*			mutex_exit(&smp->sm_npslock);*/
 			return ENAMETOOLONG;
 		}
 		*npp++ = np;
@@ -287,7 +287,7 @@
 		if (error)
 			break;
 	}
-/*	simple_unlock(&smp->sm_npslock);*/
+/*	mutex_exit(&smp->sm_npslock);*/
 	return error;
 }