From 3a6ea06efab29198ba664945cec8296b7e1e356e Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Thu, 11 Nov 2004 10:33:58 +0000 Subject: merge from 2_0_merge1 to 2_0_merge2 --- kernel/util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'kernel/util.c') diff --git a/kernel/util.c b/kernel/util.c index 13f3fe5..ac6455d 100644 --- a/kernel/util.c +++ b/kernel/util.c @@ -17,7 +17,7 @@ MODULE_DESCRIPTION("Filesystem in Userspace"); MODULE_LICENSE("GPL"); #endif -spinlock_t fuse_lock = SPIN_LOCK_UNLOCKED; +spinlock_t fuse_lock; int __init fuse_init(void) { @@ -27,6 +27,7 @@ int __init fuse_init(void) FUSE_VERSION, FUSE_KERNEL_VERSION, FUSE_KERNEL_MINOR_VERSION); + spin_lock_init(&fuse_lock); res = fuse_fs_init(); if (res) goto err; -- cgit v1.2.3