linux/generic: update mini_fo evict_inode migration
authorAlexandros C. Couloumbis <alex@ozo.com>
Mon, 13 Sep 2010 07:22:39 +0000 (07:22 +0000)
committerAlexandros C. Couloumbis <alex@ozo.com>
Mon, 13 Sep 2010 07:22:39 +0000 (07:22 +0000)
SVN-Revision: 23046

target/linux/generic/patches-2.6.36/217-mini_fo_2.6.36_fixes.patch

index cae9547b00274db8dc6bffd8035fcf5793fe4d29..f8d2ff66286e97d8e529ce62823d925d1116c5c9 100644 (file)
@@ -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,
  };