diff options
author | Hamish Guthrie <hcg@openwrt.org> | 2009-05-28 10:00:48 +0000 |
---|---|---|
committer | Hamish Guthrie <hcg@openwrt.org> | 2009-05-28 10:00:48 +0000 |
commit | 9a3d875aac7e3011bb4cceb9f70c1d4fe65fd69a (patch) | |
tree | 6527b3196b8418cb3359748a798c79644d18faf8 /target/linux/generic-2.6/patches-2.6.29/212-mini_fo_2.6.26_fixes.patch | |
parent | 2c8109cadb574dc5db1b912a708933f1ff3baf56 (diff) | |
download | master-187ad058-9a3d875aac7e3011bb4cceb9f70c1d4fe65fd69a.tar.gz master-187ad058-9a3d875aac7e3011bb4cceb9f70c1d4fe65fd69a.tar.bz2 master-187ad058-9a3d875aac7e3011bb4cceb9f70c1d4fe65fd69a.zip |
[kernel] revert 15922 - add back 2.6.29 kernel support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16127 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.29/212-mini_fo_2.6.26_fixes.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.29/212-mini_fo_2.6.26_fixes.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.29/212-mini_fo_2.6.26_fixes.patch b/target/linux/generic-2.6/patches-2.6.29/212-mini_fo_2.6.26_fixes.patch new file mode 100644 index 0000000000..8bd9ba3244 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.29/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 @@ mini_fo_write_inode(inode_t *inode, int + #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 @@ mini_fo_put_inode(inode_t *inode) + 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 @@ mini_fo_clear_inode(inode_t *inode) + * 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 @@ struct super_operations mini_fo_sops = + #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) */ |