From b318b3d69b852fa474576ddcb05286aa6c08577c Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <miklos@szeredi.hu>
Date: Wed, 2 May 2007 17:48:09 +0000
Subject: kernel: sync with mainline...

---
 kernel/fuse_i.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'kernel/fuse_i.h')

diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h
index 6d084e2..b9a9ac3 100644
--- a/kernel/fuse_i.h
+++ b/kernel/fuse_i.h
@@ -41,10 +41,16 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
 #  define KERNEL_2_6_19_PLUS
 #endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
+#  define KERNEL_2_6_21_PLUS
+#endif
 
 #if defined(__arm__) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
 #define DCACHE_BUG
 #endif
+#ifndef KERNEL_2_6_15_PLUS
+#define kmem_cache kmem_cache_s
+#endif
 
 #include "config.h"
 #endif /* FUSE_MAINLINE */
@@ -617,3 +623,8 @@ int fuse_ctl_add_conn(struct fuse_conn *fc);
  * Remove connection from control filesystem
  */
 void fuse_ctl_remove_conn(struct fuse_conn *fc);
+
+/**
+ * Is file type valid?
+ */
+int fuse_valid_type(int m);
-- 
cgit v1.2.3