Module Name: src
Committed By: yamt
Date: Sun May 17 05:54:42 UTC 2009
Modified Files:
src/sys/kern: sys_generic.c vfs_vnops.c
src/sys/sys: file.h
Log Message:
remove FILE_LOCK and FILE_UNLOCK.
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/sys/kern/sys_generic.c
cvs rdiff -u -r1.165 -r1.166 src/sys/kern/vfs_vnops.c
cvs rdiff -u -r1.67 -r1.68 src/sys/sys/file.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/sys_generic.c
diff -u src/sys/kern/sys_generic.c:1.120 src/sys/kern/sys_generic.c:1.121
--- src/sys/kern/sys_generic.c:1.120 Wed Jul 2 16:45:20 2008
+++ src/sys/kern/sys_generic.c Sun May 17 05:54:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_generic.c,v 1.120 2008/07/02 16:45:20 matt Exp $ */
+/* $NetBSD: sys_generic.c,v 1.121 2009/05/17 05:54:42 yamt Exp $ */
/*-
* Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_generic.c,v 1.120 2008/07/02 16:45:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_generic.c,v 1.121 2009/05/17 05:54:42 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -593,22 +593,22 @@
switch (com) {
case FIONBIO:
- FILE_LOCK(fp);
+ mutex_enter(&fp->f_lock);
if (*(int *)data != 0)
fp->f_flag |= FNONBLOCK;
else
fp->f_flag &= ~FNONBLOCK;
- FILE_UNLOCK(fp);
+ mutex_exit(&fp->f_lock);
error = (*fp->f_ops->fo_ioctl)(fp, FIONBIO, data);
break;
case FIOASYNC:
- FILE_LOCK(fp);
+ mutex_enter(&fp->f_lock);
if (*(int *)data != 0)
fp->f_flag |= FASYNC;
else
fp->f_flag &= ~FASYNC;
- FILE_UNLOCK(fp);
+ mutex_exit(&fp->f_lock);
error = (*fp->f_ops->fo_ioctl)(fp, FIOASYNC, data);
break;
Index: src/sys/kern/vfs_vnops.c
diff -u src/sys/kern/vfs_vnops.c:1.165 src/sys/kern/vfs_vnops.c:1.166
--- src/sys/kern/vfs_vnops.c:1.165 Sat Apr 11 23:05:26 2009
+++ src/sys/kern/vfs_vnops.c Sun May 17 05:54:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnops.c,v 1.165 2009/04/11 23:05:26 christos Exp $ */
+/* $NetBSD: vfs_vnops.c,v 1.166 2009/05/17 05:54:42 yamt Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.165 2009/04/11 23:05:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.166 2009/05/17 05:54:42 yamt Exp $");
#include "veriexec.h"
@@ -428,9 +428,9 @@
auio.uio_offset = fp->f_offset;
error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, cookies,
ncookies);
- FILE_LOCK(fp);
+ mutex_enter(&fp->f_lock);
fp->f_offset = auio.uio_offset;
- FILE_UNLOCK(fp);
+ mutex_exit(&fp->f_lock);
VOP_UNLOCK(vp, 0);
if (error)
return (error);
@@ -450,10 +450,10 @@
struct vnode *tvp = vp;
vp = vp->v_mount->mnt_vnodecovered;
VREF(vp);
- FILE_LOCK(fp);
+ mutex_enter(&fp->f_lock);
fp->f_data = vp;
fp->f_offset = 0;
- FILE_UNLOCK(fp);
+ mutex_exit(&fp->f_lock);
vrele(tvp);
goto unionread;
}
Index: src/sys/sys/file.h
diff -u src/sys/sys/file.h:1.67 src/sys/sys/file.h:1.68
--- src/sys/sys/file.h:1.67 Sat Apr 4 10:12:52 2009
+++ src/sys/sys/file.h Sun May 17 05:54:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: file.h,v 1.67 2009/04/04 10:12:52 ad Exp $ */
+/* $NetBSD: file.h,v 1.68 2009/05/17 05:54:42 yamt Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -126,9 +126,6 @@
SLIST_ENTRY(file) f_unplist; /* deferred close: see uipc_usrreq.c */
};
-#define FILE_LOCK(fp) mutex_enter(&(fp)->f_lock)
-#define FILE_UNLOCK(fp) mutex_exit(&(fp)->f_lock)
-
/*
* Flags for fo_read and fo_write and do_fileread/write/v
*/
