LU-6177 lfsck: calculate the phase2 time correctly

[fs/lustre-release.git] / lustre / obdclass / obd_mount_server.c

diff --git a/lustre/obdclass/obd_mount_server.c b/lustre/obdclass/obd_mount_server.c
index 6ca841f..96681a0 100644 (file)
--- a/lustre/obdclass/obd_mount_server.c
+++ b/lustre/obdclass/obd_mount_server.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2013, Intel Corporation.
+ * Copyright (c) 2013, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -64,7 +64,7 @@
 
 /*********** mount lookup *********/
 
-DEFINE_MUTEX(lustre_mount_info_lock);
+static DEFINE_MUTEX(lustre_mount_info_lock);
 static struct list_head server_mount_info_list =
        LIST_HEAD_INIT(server_mount_info_list);
 
@@ -241,8 +241,8 @@ static int server_start_mgs(struct super_block *sb)
 
        if (!rc) {
                rc = lustre_start_simple(LUSTRE_MGS_OBDNAME, LUSTRE_MGS_NAME,
-                                        LUSTRE_MGS_OBDNAME, 0, 0,
-                                        lsi->lsi_osd_obdname, 0);
+                                        LUSTRE_MGS_OBDNAME, NULL, NULL,
+                                        lsi->lsi_osd_obdname, NULL);
                /* server_deregister_mount() is not called previously, for lsi
                 * and other stuff can't be freed cleanly when mgs calls
                 * server_put_mount() in error handling case (see b=17758),
@@ -378,7 +378,7 @@ EXPORT_SYMBOL(tgt_name2lwp_name);
 
 static struct list_head lwp_register_list =
        LIST_HEAD_INIT(lwp_register_list);
-DEFINE_MUTEX(lwp_register_list_lock);
+static DEFINE_MUTEX(lwp_register_list_lock);
 
 int lustre_register_lwp_item(const char *lwpname, struct obd_export **exp,
                             register_lwp_cb cb_func, void *cb_data)
@@ -609,7 +609,7 @@ static int lustre_lwp_setup(struct lustre_cfg *lcfg, struct lustre_sb_info *lsi,
        sprintf(lwpuuid, "%s_UUID", lwpname);
        rc = lustre_start_simple(lwpname, LUSTRE_LWP_NAME,
                                 lwpuuid, lustre_cfg_string(lcfg, 1),
-                                0, 0, 0);
+                                NULL, NULL, NULL);
        if (rc) {
                CERROR("%s: setup up failed: rc %d\n", lwpname, rc);
                GOTO(out, rc);
@@ -999,7 +999,7 @@ out:
        return rc;
 }
 
-DEFINE_MUTEX(server_start_lock);
+static DEFINE_MUTEX(server_start_lock);
 
 /* Stop MDS/OSS if nobody is using them */
 static int server_stop_servers(int lsiflags)
@@ -1047,7 +1047,6 @@ int server_mti_print(const char *title, struct mgs_target_info *mti)
                  mti->mti_config_ver, mti->mti_flags);
        return 0;
 }
-EXPORT_SYMBOL(server_mti_print);
 
 /* Generate data for registration */
 static int server_lsi2mti(struct lustre_sb_info *lsi,
@@ -1245,7 +1244,7 @@ static int server_start_targets(struct super_block *sb)
                        rc = lustre_start_simple(LUSTRE_MDS_OBDNAME,
                                                 LUSTRE_MDS_NAME,
                                                 LUSTRE_MDS_OBDNAME"_uuid",
-                                                0, 0, 0, 0);
+                                                NULL, NULL, NULL, NULL);
                        if (rc) {
                                mutex_unlock(&server_start_lock);
                                CERROR("failed to start MDS: %d\n", rc);
@@ -1264,7 +1263,7 @@ static int server_start_targets(struct super_block *sb)
                        rc = lustre_start_simple(LUSTRE_OSS_OBDNAME,
                                                 LUSTRE_OSS_NAME,
                                                 LUSTRE_OSS_OBDNAME"_uuid",
-                                                0, 0, 0, 0);
+                                                NULL, NULL, NULL, NULL);
                        if (rc) {
                                mutex_unlock(&server_start_lock);
                                CERROR("failed to start OSS: %d\n", rc);
@@ -1368,6 +1367,8 @@ out_stop_service:
 
 static int lsi_prepare(struct lustre_sb_info *lsi)
 {
+       const char *osd_type;
+       const char *fstype;
        __u32 index;
        int rc;
        ENTRY;
@@ -1381,28 +1382,26 @@ static int lsi_prepare(struct lustre_sb_info *lsi)
                RETURN(-EINVAL);
        }
 
-       if (strlen(lsi->lsi_lmd->lmd_profile) >= sizeof(lsi->lsi_svname))
-               RETURN(-ENAMETOOLONG);
-
-       strcpy(lsi->lsi_svname, lsi->lsi_lmd->lmd_profile);
-
        /* Determine osd type */
-       if (lsi->lsi_lmd->lmd_osd_type != NULL) {
-               if (strlen(lsi->lsi_lmd->lmd_osd_type) >=
-                   sizeof(lsi->lsi_osd_type))
-                       RETURN(-ENAMETOOLONG);
-
-               strcpy(lsi->lsi_osd_type, lsi->lsi_lmd->lmd_osd_type);
+       if (lsi->lsi_lmd->lmd_osd_type == NULL) {
+               osd_type = LUSTRE_OSD_LDISKFS_NAME;
+               fstype = "ldiskfs";
        } else {
-               strcpy(lsi->lsi_osd_type, LUSTRE_OSD_LDISKFS_NAME);
+               osd_type = lsi->lsi_lmd->lmd_osd_type;
+               fstype = lsi->lsi_lmd->lmd_osd_type;
        }
 
+       if (strlen(lsi->lsi_lmd->lmd_profile) >= sizeof(lsi->lsi_svname) ||
+           strlen(osd_type) >= sizeof(lsi->lsi_osd_type) ||
+           strlen(fstype) >= sizeof(lsi->lsi_fstype))
+               RETURN(-ENAMETOOLONG);
+
+       strlcpy(lsi->lsi_svname, lsi->lsi_lmd->lmd_profile,
+               sizeof(lsi->lsi_svname));
+       strlcpy(lsi->lsi_osd_type, osd_type, sizeof(lsi->lsi_osd_type));
        /* XXX: a temp. solution for components using ldiskfs
         *      to be removed in one of the subsequent patches */
-       if (!strcmp(lsi->lsi_lmd->lmd_osd_type, "osd-ldiskfs"))
-               strcpy(lsi->lsi_fstype, "ldiskfs");
-       else
-               strcpy(lsi->lsi_fstype, lsi->lsi_lmd->lmd_osd_type);
+       strlcpy(lsi->lsi_fstype, fstype, sizeof(lsi->lsi_fstype));
 
        /* Determine server type */
        rc = server_name2index(lsi->lsi_svname, &index, NULL);
@@ -1619,7 +1618,7 @@ static ssize_t lustre_listxattr(struct dentry *d_entry, char *name,
        return -EOPNOTSUPP;
 }
 
-const struct inode_operations server_inode_operations = {
+static const struct inode_operations server_inode_operations = {
        .setxattr       = lustre_setxattr,
        .getxattr       = lustre_getxattr,
        .listxattr      = lustre_listxattr,
@@ -1630,7 +1629,7 @@ const struct inode_operations server_inode_operations = {
 
 static int server_fill_super_common(struct super_block *sb)
 {
-       struct inode *root = 0;
+       struct inode *root = NULL;
        ENTRY;
 
        CDEBUG(D_MOUNT, "Server sb, dev=%d\n", (int)sb->s_dev);
@@ -1868,4 +1867,3 @@ void server_calc_timeout(struct lustre_sb_info *lsi, struct obd_device *obd)
        obd->obd_recovery_time_hard = hard;
        obd->obd_recovery_ir_factor = factor;
 }
-EXPORT_SYMBOL(server_calc_timeout);