Whamcloud - gitweb
b=22176 Add .sync_fs super block handler
[fs/lustre-release.git] / lustre / llite / super25.c
index b61e7fc..0bf72df 100644 (file)
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -38,7 +38,6 @@
 
 #include <linux/module.h>
 #include <linux/types.h>
-#include <linux/random.h>
 #include <linux/version.h>
 #include <lustre_lite.h>
 #include <lustre_ha.h>
@@ -54,7 +53,7 @@ static struct inode *ll_alloc_inode(struct super_block *sb)
 {
         struct ll_inode_info *lli;
         ll_stats_ops_tally(ll_s2sbi(sb), LPROC_LL_ALLOC_INODE, 1);
-        OBD_SLAB_ALLOC_PTR(lli, ll_inode_cachep);
+        OBD_SLAB_ALLOC_PTR_GFP(lli, ll_inode_cachep, CFS_ALLOC_IO);
         if (lli == NULL)
                 return NULL;
 
@@ -74,7 +73,7 @@ int ll_init_inodecache(void)
 {
         ll_inode_cachep = cfs_mem_cache_create("lustre_inode_cache",
                                                sizeof(struct ll_inode_info),
-                                               0, SLAB_HWCACHE_ALIGN);
+                                               0, CFS_SLAB_HWCACHE_ALIGN);
         if (ll_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
@@ -100,6 +99,7 @@ struct super_operations lustre_super_operations =
         .umount_begin  = ll_umount_begin,
         .remount_fs    = ll_remount_fs,
         .show_options  = ll_show_options,
+        .sync_fs       = ll_sync_fs,
 };
 
 
@@ -125,7 +125,7 @@ static int __init init_lustre_lite(void)
                 return -ENOMEM;
         ll_file_data_slab = cfs_mem_cache_create("ll_file_data",
                                                  sizeof(struct ll_file_data), 0,
-                                                 SLAB_HWCACHE_ALIGN);
+                                                 CFS_SLAB_HWCACHE_ALIGN);
         if (ll_file_data_slab == NULL) {
                 ll_destroy_inodecache();
                 return -ENOMEM;
@@ -143,7 +143,7 @@ static int __init init_lustre_lite(void)
 
         ll_rmtperm_hash_cachep = cfs_mem_cache_create("ll_rmtperm_hash_cache",
                                                    REMOTE_PERM_HASHSIZE *
-                                                   sizeof(struct list_head),
+                                                   sizeof(cfs_list_t),
                                                    0, 0);
         if (ll_rmtperm_hash_cachep == NULL) {
                 cfs_mem_cache_destroy(ll_remote_perm_cachep);
@@ -162,7 +162,7 @@ static int __init init_lustre_lite(void)
 
         lustre_register_client_process_config(ll_process_config);
 
-        ll_get_random_bytes(seed, sizeof(seed));
+        cfs_get_random_bytes(seed, sizeof(seed));
 
         /* Nodes with small feet have little entropy
          * the NID for this node gives the most entropy in the low bits */
@@ -175,8 +175,8 @@ static int __init init_lustre_lite(void)
                 }
         }
 
-        do_gettimeofday(&tv);
-        ll_srand(tv.tv_sec ^ seed[0], tv.tv_usec ^ seed[1]);
+        cfs_gettimeofday(&tv);
+        cfs_srand(tv.tv_sec ^ seed[0], tv.tv_usec ^ seed[1]);
 
         init_timer(&ll_capa_timer);
         ll_capa_timer.function = ll_capa_timer_callback;