hc
2024-05-10 23fa18eaa71266feff7ba8d83022d9e1cc83c65a
kernel/fs/reiserfs/super.c
....@@ -651,15 +651,9 @@
651651 return &ei->vfs_inode;
652652 }
653653
654
-static void reiserfs_i_callback(struct rcu_head *head)
654
+static void reiserfs_free_inode(struct inode *inode)
655655 {
656
- struct inode *inode = container_of(head, struct inode, i_rcu);
657656 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);
663657 }
664658
665659 static void init_once(void *foo)
....@@ -816,7 +810,7 @@
816810
817811 static const struct super_operations reiserfs_sops = {
818812 .alloc_inode = reiserfs_alloc_inode,
819
- .destroy_inode = reiserfs_destroy_inode,
813
+ .free_inode = reiserfs_free_inode,
820814 .write_inode = reiserfs_write_inode,
821815 .dirty_inode = reiserfs_dirty_inode,
822816 .evict_inode = reiserfs_evict_inode,
....@@ -1443,17 +1437,12 @@
14431437 unsigned long safe_mask = 0;
14441438 unsigned int commit_max_age = (unsigned int)-1;
14451439 struct reiserfs_journal *journal = SB_JOURNAL(s);
1446
- char *new_opts;
14471440 int err;
14481441 char *qf_names[REISERFS_MAXQUOTAS];
14491442 unsigned int qfmt = 0;
14501443 #ifdef CONFIG_QUOTA
14511444 int i;
14521445 #endif
1453
-
1454
- new_opts = kstrdup(arg, GFP_KERNEL);
1455
- if (arg && !new_opts)
1456
- return -ENOMEM;
14571446
14581447 sync_filesystem(s);
14591448 reiserfs_write_lock(s);
....@@ -1605,7 +1594,6 @@
16051594 out_err_unlock:
16061595 reiserfs_write_unlock(s);
16071596 out_err:
1608
- kfree(new_opts);
16091597 return err;
16101598 }
16111599
....@@ -1982,6 +1970,9 @@
19821970 s->s_id);
19831971 goto error_unlocked;
19841972 }
1973
+
1974
+ s->s_time_min = 0;
1975
+ s->s_time_max = U32_MAX;
19851976
19861977 rs = SB_DISK_SUPER_BLOCK(s);
19871978 /*
....@@ -2658,6 +2649,7 @@
26582649 MODULE_DESCRIPTION("ReiserFS journaled filesystem");
26592650 MODULE_AUTHOR("Hans Reiser <reiser@namesys.com>");
26602651 MODULE_LICENSE("GPL");
2652
+MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY);
26612653
26622654 module_init(init_reiserfs_fs);
26632655 module_exit(exit_reiserfs_fs);