Module Name: src
Committed By: uebayasi
Date: Wed Jan 27 15:52:31 UTC 2010
Modified Files:
src/sys/miscfs/genfs: genfs_node.h genfs_vnops.c
Log Message:
Don't forget to tell the result of rw_tryenter().
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/miscfs/genfs/genfs_node.h
cvs rdiff -u -r1.175 -r1.176 src/sys/miscfs/genfs/genfs_vnops.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/miscfs/genfs/genfs_node.h
diff -u src/sys/miscfs/genfs/genfs_node.h:1.18 src/sys/miscfs/genfs/genfs_node.h:1.19
--- src/sys/miscfs/genfs/genfs_node.h:1.18 Wed Jan 27 15:18:40 2010
+++ src/sys/miscfs/genfs/genfs_node.h Wed Jan 27 15:52:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_node.h,v 1.18 2010/01/27 15:18:40 uebayasi Exp $ */
+/* $NetBSD: genfs_node.h,v 1.19 2010/01/27 15:52:31 uebayasi Exp $ */
/*
* Copyright (c) 2001 Chuck Silvers.
@@ -91,7 +91,7 @@
void genfs_node_wrlock(struct vnode *);
void genfs_node_rdlock(struct vnode *);
-void genfs_node_rdtrylock(struct vnode *);
+int genfs_node_rdtrylock(struct vnode *);
void genfs_node_unlock(struct vnode *);
#endif /* _MISCFS_GENFS_GENFS_NODE_H_ */
Index: src/sys/miscfs/genfs/genfs_vnops.c
diff -u src/sys/miscfs/genfs/genfs_vnops.c:1.175 src/sys/miscfs/genfs/genfs_vnops.c:1.176
--- src/sys/miscfs/genfs/genfs_vnops.c:1.175 Wed Jan 27 15:18:40 2010
+++ src/sys/miscfs/genfs/genfs_vnops.c Wed Jan 27 15:52:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_vnops.c,v 1.175 2010/01/27 15:18:40 uebayasi Exp $ */
+/* $NetBSD: genfs_vnops.c,v 1.176 2010/01/27 15:52:31 uebayasi Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.175 2010/01/27 15:18:40 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.176 2010/01/27 15:52:31 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -514,12 +514,12 @@
rw_enter(&gp->g_glock, RW_READER);
}
-void
+int
genfs_node_rdtrylock(struct vnode *vp)
{
struct genfs_node *gp = VTOG(vp);
- rw_tryenter(&gp->g_glock, RW_READER);
+ return rw_tryenter(&gp->g_glock, RW_READER);
}
void
