aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-06-02 18:27:52 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-06-02 18:27:52 +0000
commited5a50c676dc1d210cc0871135ca763b5a5e20be (patch)
tree1704555de3827d847492cf70930f60bb0328fbeb /target/linux
parent60656e167d0975993561c26884fac80143d187e8 (diff)
downloadupstream-ed5a50c676dc1d210cc0871135ca763b5a5e20be.tar.gz
upstream-ed5a50c676dc1d210cc0871135ca763b5a5e20be.tar.bz2
upstream-ed5a50c676dc1d210cc0871135ca763b5a5e20be.zip
fix mini_fo on 2.6.26-rc4
SVN-Revision: 11330
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic-2.6/patches-2.6.26/212-mini_fo_2.6.26_fixes.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/212-mini_fo_2.6.26_fixes.patch b/target/linux/generic-2.6/patches-2.6.26/212-mini_fo_2.6.26_fixes.patch
new file mode 100644
index 0000000000..d4c940d4a2
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.26/212-mini_fo_2.6.26_fixes.patch
@@ -0,0 +1,37 @@
+--- a/fs/mini_fo/super.c
++++ b/fs/mini_fo/super.c
+@@ -84,6 +84,7 @@
+ #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
+
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
+ STATIC void
+ mini_fo_put_inode(inode_t *inode)
+ {
+@@ -99,6 +100,7 @@
+ if (atomic_read(&inode->i_count) == 1)
+ inode->i_nlink = 0;
+ }
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
+
+
+ #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
+@@ -238,7 +240,7 @@
+ * dies.
+ */
+ STATIC void
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)))
+ mini_fo_umount_begin(struct vfsmount *mnt, int flags)
+ {
+ struct vfsmount *hidden_mnt;
+@@ -290,7 +292,9 @@
+ #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
+ write_inode: mini_fo_write_inode,
+ #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
+ put_inode: mini_fo_put_inode,
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
+ #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
+ delete_inode: mini_fo_delete_inode,
+ #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */