ppp: fix fallout from the size reduction patch (thx, frogonwheels)
[openwrt/svn-archive/archive.git] / target / linux / generic / patches-2.6.36 / 217-mini_fo_2.6.36_fixes.patch
1 --- a/fs/mini_fo/super.c
2 +++ b/fs/mini_fo/super.c
3 @@ -76,7 +76,7 @@ mini_fo_read_inode(inode_t *inode)
4 * to write some of our own stuff to disk.
5 */
6 STATIC void
7 -mini_fo_write_inode(inode_t *inode, int sync)
8 +mini_fo_write_inode(inode_t *inode, struct writeback_control *wbc)
9 {
10 print_entry_location();
11 print_exit_location();
12 @@ -112,13 +112,14 @@ mini_fo_put_inode(inode_t *inode)
13 * on our and the lower inode.
14 */
15 STATIC void
16 -mini_fo_delete_inode(inode_t *inode)
17 +mini_fo_evict_inode(inode_t *inode)
18 {
19 print_entry_location();
20
21 - fist_checkinode(inode, "mini_fo_delete_inode IN");
22 - inode->i_size = 0; /* every f/s seems to do that */
23 - clear_inode(inode);
24 + fist_checkinode(inode, "mini_fo_evict_inode IN");
25 + truncate_inode_pages(&inode->i_data, 0); /* FIXME: do we need this? */
26 + invalidate_inode_buffers(inode);
27 + end_writeback(inode);
28
29 print_exit_location();
30 }
31 @@ -300,11 +301,10 @@ struct super_operations mini_fo_sops =
32 put_inode: mini_fo_put_inode,
33 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
34 #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
35 - delete_inode: mini_fo_delete_inode,
36 + evict_inode: mini_fo_evict_inode,
37 #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
38 put_super: mini_fo_put_super,
39 statfs: mini_fo_statfs,
40 remount_fs: mini_fo_remount_fs,
41 - clear_inode: mini_fo_clear_inode,
42 umount_begin: mini_fo_umount_begin,
43 };