Module Name: src
Committed By: tsutsui
Date: Sun Sep 13 05:17:37 UTC 2009
Modified Files:
src/sys/ufs/ext2fs: ext2fs_vfsops.c
src/sys/ufs/ffs: ffs_vfsops.c
src/sys/ufs/lfs: lfs_alloc.c lfs_syscalls.c lfs_vfsops.c
src/sys/ufs/ufs: ufs_extern.h
Log Message:
Move declaration of ufs_hashlock into <ufs/ufs_extern.h> from each c source.
To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 src/sys/ufs/ext2fs/ext2fs_vfsops.c
cvs rdiff -u -r1.250 -r1.251 src/sys/ufs/ffs/ffs_vfsops.c
cvs rdiff -u -r1.107 -r1.108 src/sys/ufs/lfs/lfs_alloc.c
cvs rdiff -u -r1.134 -r1.135 src/sys/ufs/lfs/lfs_syscalls.c
cvs rdiff -u -r1.277 -r1.278 src/sys/ufs/lfs/lfs_vfsops.c
cvs rdiff -u -r1.61 -r1.62 src/sys/ufs/ufs/ufs_extern.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/ufs/ext2fs/ext2fs_vfsops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.149 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.150
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.149 Sat Sep 12 02:50:38 2009
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c Sun Sep 13 05:17:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_vfsops.c,v 1.149 2009/09/12 02:50:38 tsutsui Exp $ */
+/* $NetBSD: ext2fs_vfsops.c,v 1.150 2009/09/13 05:17:36 tsutsui Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.149 2009/09/12 02:50:38 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.150 2009/09/13 05:17:36 tsutsui Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -109,8 +109,6 @@
MODULE(MODULE_CLASS_VFS, ext2fs, "ffs");
-extern kmutex_t ufs_hashlock;
-
int ext2fs_sbupdate(struct ufsmount *, int);
static int ext2fs_checksb(struct ext2fs *, int);
static void ext2fs_set_inode_guid(struct inode *);
Index: src/sys/ufs/ffs/ffs_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.250 src/sys/ufs/ffs/ffs_vfsops.c:1.251
--- src/sys/ufs/ffs/ffs_vfsops.c:1.250 Fri Jul 31 20:58:50 2009
+++ src/sys/ufs/ffs/ffs_vfsops.c Sun Sep 13 05:17:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vfsops.c,v 1.250 2009/07/31 20:58:50 pooka Exp $ */
+/* $NetBSD: ffs_vfsops.c,v 1.251 2009/09/13 05:17:36 tsutsui Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.250 2009/07/31 20:58:50 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.251 2009/09/13 05:17:36 tsutsui Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -117,8 +117,6 @@
/* how many times ffs_init() was called */
int ffs_initcount = 0;
-extern kmutex_t ufs_hashlock;
-
extern const struct vnodeopv_desc ffs_vnodeop_opv_desc;
extern const struct vnodeopv_desc ffs_specop_opv_desc;
extern const struct vnodeopv_desc ffs_fifoop_opv_desc;
Index: src/sys/ufs/lfs/lfs_alloc.c
diff -u src/sys/ufs/lfs/lfs_alloc.c:1.107 src/sys/ufs/lfs/lfs_alloc.c:1.108
--- src/sys/ufs/lfs/lfs_alloc.c:1.107 Mon Apr 28 20:24:11 2008
+++ src/sys/ufs/lfs/lfs_alloc.c Sun Sep 13 05:17:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_alloc.c,v 1.107 2008/04/28 20:24:11 martin Exp $ */
+/* $NetBSD: lfs_alloc.c,v 1.108 2009/09/13 05:17:37 tsutsui Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_alloc.c,v 1.107 2008/04/28 20:24:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_alloc.c,v 1.108 2009/09/13 05:17:37 tsutsui Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -88,8 +88,6 @@
#include <ufs/lfs/lfs.h>
#include <ufs/lfs/lfs_extern.h>
-extern kmutex_t ufs_hashlock;
-
/* Constants for inode free bitmap */
#define BMSHIFT 5 /* 2 ** 5 = 32 */
#define BMMASK ((1 << BMSHIFT) - 1)
Index: src/sys/ufs/lfs/lfs_syscalls.c
diff -u src/sys/ufs/lfs/lfs_syscalls.c:1.134 src/sys/ufs/lfs/lfs_syscalls.c:1.135
--- src/sys/ufs/lfs/lfs_syscalls.c:1.134 Sun Jan 11 02:45:56 2009
+++ src/sys/ufs/lfs/lfs_syscalls.c Sun Sep 13 05:17:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_syscalls.c,v 1.134 2009/01/11 02:45:56 christos Exp $ */
+/* $NetBSD: lfs_syscalls.c,v 1.135 2009/09/13 05:17:37 tsutsui Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007, 2008
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_syscalls.c,v 1.134 2009/01/11 02:45:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_syscalls.c,v 1.135 2009/09/13 05:17:37 tsutsui Exp $");
#ifndef LFS
# define LFS /* for prototypes in syscallargs.h */
@@ -1018,7 +1018,6 @@
* we lfs_vref, and it is the caller's responsibility to lfs_vunref
* when finished.
*/
-extern kmutex_t ufs_hashlock;
int
lfs_fasthashget(dev_t dev, ino_t ino, struct vnode **vpp)
Index: src/sys/ufs/lfs/lfs_vfsops.c
diff -u src/sys/ufs/lfs/lfs_vfsops.c:1.277 src/sys/ufs/lfs/lfs_vfsops.c:1.278
--- src/sys/ufs/lfs/lfs_vfsops.c:1.277 Wed Aug 5 15:39:57 2009
+++ src/sys/ufs/lfs/lfs_vfsops.c Sun Sep 13 05:17:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vfsops.c,v 1.277 2009/08/05 15:39:57 pooka Exp $ */
+/* $NetBSD: lfs_vfsops.c,v 1.278 2009/09/13 05:17:37 tsutsui Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.277 2009/08/05 15:39:57 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.278 2009/09/13 05:17:37 tsutsui Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -1251,8 +1251,6 @@
return (error);
}
-extern kmutex_t ufs_hashlock;
-
/*
* Look up an LFS dinode number to find its incore vnode. If not already
* in core, read it in from the specified device. Return the inode locked.
Index: src/sys/ufs/ufs/ufs_extern.h
diff -u src/sys/ufs/ufs/ufs_extern.h:1.61 src/sys/ufs/ufs/ufs_extern.h:1.62
--- src/sys/ufs/ufs/ufs_extern.h:1.61 Sun Feb 22 20:28:07 2009
+++ src/sys/ufs/ufs/ufs_extern.h Sun Sep 13 05:17:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_extern.h,v 1.61 2009/02/22 20:28:07 ad Exp $ */
+/* $NetBSD: ufs_extern.h,v 1.62 2009/09/13 05:17:37 tsutsui Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -175,5 +175,6 @@
__END_DECLS
extern kmutex_t ufs_ihash_lock;
+extern kmutex_t ufs_hashlock;
#endif /* !_UFS_UFS_EXTERN_H_ */
