diff options
author | Mirko Vogt <mirko@openwrt.org> | 2009-08-22 12:46:12 +0000 |
---|---|---|
committer | Mirko Vogt <mirko@openwrt.org> | 2009-08-22 12:46:12 +0000 |
commit | 8bc9864493c5ba790f68769ed71b54de04ba4ea6 (patch) | |
tree | f2e9f1150816b597adc38a4ca8a7a5f14a0909e5 /target/linux/generic-2.6/patches-2.6.31/212-mini_fo_2.6.26_fixes.patch | |
parent | 14dde50efd4eb00edb2ae3f2b8ac1b2ed09604c4 (diff) | |
download | master-187ad058-8bc9864493c5ba790f68769ed71b54de04ba4ea6.tar.gz master-187ad058-8bc9864493c5ba790f68769ed71b54de04ba4ea6.tar.bz2 master-187ad058-8bc9864493c5ba790f68769ed71b54de04ba4ea6.zip |
add generic patchset levelled up to 2.6.31-rc6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17351 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.31/212-mini_fo_2.6.26_fixes.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.31/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.31/212-mini_fo_2.6.26_fixes.patch b/target/linux/generic-2.6/patches-2.6.31/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.31/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) */ |