aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-09-13 07:22:39 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-09-13 07:22:39 +0000
commite840c4b2d9f7572a9dde7e0845daf194ccc9ea48 (patch)
tree25b55717726c6941846838abf7d473e7aa832308 /target/linux/generic
parent69a3f089a0ef861f2f705e0b69cc124e0254a48b (diff)
downloadmaster-187ad058-e840c4b2d9f7572a9dde7e0845daf194ccc9ea48.tar.gz
master-187ad058-e840c4b2d9f7572a9dde7e0845daf194ccc9ea48.tar.bz2
master-187ad058-e840c4b2d9f7572a9dde7e0845daf194ccc9ea48.zip
linux/generic: update mini_fo evict_inode migration
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23046 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-2.6.36/217-mini_fo_2.6.36_fixes.patch26
1 files changed, 17 insertions, 9 deletions
diff --git a/target/linux/generic/patches-2.6.36/217-mini_fo_2.6.36_fixes.patch b/target/linux/generic/patches-2.6.36/217-mini_fo_2.6.36_fixes.patch
index cae9547b00..f8d2ff6628 100644
--- a/target/linux/generic/patches-2.6.36/217-mini_fo_2.6.36_fixes.patch
+++ b/target/linux/generic/patches-2.6.36/217-mini_fo_2.6.36_fixes.patch
@@ -1,22 +1,30 @@
--- a/fs/mini_fo/super.c
+++ b/fs/mini_fo/super.c
-@@ -296,11 +296,19 @@ struct super_operations mini_fo_sops =
+@@ -117,8 +117,11 @@ mini_fo_delete_inode(inode_t *inode)
+ print_entry_location();
+
+ fist_checkinode(inode, "mini_fo_delete_inode IN");
+- inode->i_size = 0; /* every f/s seems to do that */
+- clear_inode(inode);
++ // inode->i_size = 0; /* every f/s seems to do that */
++ end_writeback(inode);
++ dquot_drop(inode);
++ inode->i_blocks = 0;
++
+
+ print_exit_location();
+ }
+@@ -296,11 +299,11 @@ struct super_operations mini_fo_sops =
put_inode: mini_fo_put_inode,
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,35)
+- delete_inode: mini_fo_delete_inode,
+ evict_inode: mini_fo_delete_inode,
-+#else
- delete_inode: mini_fo_delete_inode,
-+#endif
#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
put_super: mini_fo_put_super,
statfs: mini_fo_statfs,
remount_fs: mini_fo_remount_fs,
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,35)
+- clear_inode: mini_fo_clear_inode,
+ evict_inode: mini_fo_clear_inode,
-+#else
- clear_inode: mini_fo_clear_inode,
-+#endif
umount_begin: mini_fo_umount_begin,
};