From d93a4295c13503e52b2c3a2f6b4473a6d5bf907c Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <miklos@szeredi.hu>
Date: Sat, 30 Sep 2006 12:21:49 +0000
Subject: kernel changes

---
 kernel/fuse_i.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'kernel/fuse_i.h')

diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h
index 2515df2..e44dd9a 100644
--- a/kernel/fuse_i.h
+++ b/kernel/fuse_i.h
@@ -57,8 +57,11 @@
 #else
 #include <asm/semaphore.h>
 #define DEFINE_MUTEX(m) DECLARE_MUTEX(m)
+#define mutex_init(m) init_MUTEX(m)
+#define mutex_destroy(m) do { } while (0)
 #define mutex_lock(m) down(m)
 #define mutex_unlock(m) up(m)
+#define mutex semaphore
 #endif
 
 #ifndef BUG_ON
@@ -97,11 +100,7 @@
 extern struct list_head fuse_conn_list;
 
 /** Global mutex protecting fuse_conn_list and the control filesystem */
-#ifdef KERNEL_2_6_17_PLUS
 extern struct mutex fuse_mutex;
-#else
-extern struct semaphore fuse_mutex;
-#endif
 
 /** FUSE inode */
 struct fuse_inode {
@@ -299,6 +298,9 @@ struct fuse_conn {
 	/** Lock protecting accessess to  members of this structure */
 	spinlock_t lock;
 
+	/** Mutex protecting against directory alias creation */
+	struct mutex inst_mutex;
+
 	/** Refcount */
 	atomic_t count;
 
-- 
cgit v1.2.3