diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2006-09-30 12:21:49 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2006-09-30 12:21:49 +0000 |
| commit | d93a4295c13503e52b2c3a2f6b4473a6d5bf907c (patch) | |
| tree | d2263ed3dbea4b3dd6ac3344eb746dc11ac8b450 /kernel/fuse_i.h | |
| parent | 6cf952ab0441b1ec67b359e3dc03d52cf62a99dd (diff) | |
| download | libfuse-d93a4295c13503e52b2c3a2f6b4473a6d5bf907c.tar.gz | |
kernel changes
Diffstat (limited to 'kernel/fuse_i.h')
| -rw-r--r-- | kernel/fuse_i.h | 10 |
1 files changed, 6 insertions, 4 deletions
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; |