.. | .. |
---|
651 | 651 | return &ei->vfs_inode; |
---|
652 | 652 | } |
---|
653 | 653 | |
---|
654 | | -static void reiserfs_i_callback(struct rcu_head *head) |
---|
| 654 | +static void reiserfs_free_inode(struct inode *inode) |
---|
655 | 655 | { |
---|
656 | | - struct inode *inode = container_of(head, struct inode, i_rcu); |
---|
657 | 656 | kmem_cache_free(reiserfs_inode_cachep, REISERFS_I(inode)); |
---|
658 | | -} |
---|
659 | | - |
---|
660 | | -static void reiserfs_destroy_inode(struct inode *inode) |
---|
661 | | -{ |
---|
662 | | - call_rcu(&inode->i_rcu, reiserfs_i_callback); |
---|
663 | 657 | } |
---|
664 | 658 | |
---|
665 | 659 | static void init_once(void *foo) |
---|
.. | .. |
---|
816 | 810 | |
---|
817 | 811 | static const struct super_operations reiserfs_sops = { |
---|
818 | 812 | .alloc_inode = reiserfs_alloc_inode, |
---|
819 | | - .destroy_inode = reiserfs_destroy_inode, |
---|
| 813 | + .free_inode = reiserfs_free_inode, |
---|
820 | 814 | .write_inode = reiserfs_write_inode, |
---|
821 | 815 | .dirty_inode = reiserfs_dirty_inode, |
---|
822 | 816 | .evict_inode = reiserfs_evict_inode, |
---|
.. | .. |
---|
1443 | 1437 | unsigned long safe_mask = 0; |
---|
1444 | 1438 | unsigned int commit_max_age = (unsigned int)-1; |
---|
1445 | 1439 | struct reiserfs_journal *journal = SB_JOURNAL(s); |
---|
1446 | | - char *new_opts; |
---|
1447 | 1440 | int err; |
---|
1448 | 1441 | char *qf_names[REISERFS_MAXQUOTAS]; |
---|
1449 | 1442 | unsigned int qfmt = 0; |
---|
1450 | 1443 | #ifdef CONFIG_QUOTA |
---|
1451 | 1444 | int i; |
---|
1452 | 1445 | #endif |
---|
1453 | | - |
---|
1454 | | - new_opts = kstrdup(arg, GFP_KERNEL); |
---|
1455 | | - if (arg && !new_opts) |
---|
1456 | | - return -ENOMEM; |
---|
1457 | 1446 | |
---|
1458 | 1447 | sync_filesystem(s); |
---|
1459 | 1448 | reiserfs_write_lock(s); |
---|
.. | .. |
---|
1605 | 1594 | out_err_unlock: |
---|
1606 | 1595 | reiserfs_write_unlock(s); |
---|
1607 | 1596 | out_err: |
---|
1608 | | - kfree(new_opts); |
---|
1609 | 1597 | return err; |
---|
1610 | 1598 | } |
---|
1611 | 1599 | |
---|
.. | .. |
---|
1982 | 1970 | s->s_id); |
---|
1983 | 1971 | goto error_unlocked; |
---|
1984 | 1972 | } |
---|
| 1973 | + |
---|
| 1974 | + s->s_time_min = 0; |
---|
| 1975 | + s->s_time_max = U32_MAX; |
---|
1985 | 1976 | |
---|
1986 | 1977 | rs = SB_DISK_SUPER_BLOCK(s); |
---|
1987 | 1978 | /* |
---|
.. | .. |
---|
2658 | 2649 | MODULE_DESCRIPTION("ReiserFS journaled filesystem"); |
---|
2659 | 2650 | MODULE_AUTHOR("Hans Reiser <reiser@namesys.com>"); |
---|
2660 | 2651 | MODULE_LICENSE("GPL"); |
---|
| 2652 | +MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY); |
---|
2661 | 2653 | |
---|
2662 | 2654 | module_init(init_reiserfs_fs); |
---|
2663 | 2655 | module_exit(exit_reiserfs_fs); |
---|