diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2007-01-19 22:11:40 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2007-01-19 22:11:40 +0000 |
| commit | 6e7d018049193efe9d092bb91c4416a332f28278 (patch) | |
| tree | 1682fdb3dc3d9ca6012e3e4813b6203401ec6d0c /kernel/fuse_i.h | |
| parent | 7dcdf1bf5b4c9fe36bf6fdf98149154a3216f059 (diff) | |
| download | libfuse-6e7d018049193efe9d092bb91c4416a332f28278.tar.gz | |
merge up to fuse_2_6_merge1
Diffstat (limited to 'kernel/fuse_i.h')
| -rw-r--r-- | kernel/fuse_i.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h index f5b26f2..5259ee1 100644 --- a/kernel/fuse_i.h +++ b/kernel/fuse_i.h @@ -55,16 +55,14 @@ #include <linux/spinlock.h> #include <linux/mm.h> #include <linux/backing-dev.h> -#ifdef KERNEL_2_6_17_PLUS -#include <linux/mutex.h> -#else -#include <asm/semaphore.h> +#ifndef DEFINE_MUTEX #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 +#define i_mutex i_sem /* Hack for struct inode */ #endif #ifndef KERNEL_2_6_19_PLUS #define clear_nlink(inode) (inode)->i_nlink = 0 |