* 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/
#define PRINT_CMD CDEBUG
#define PRINT_MASK (D_SUPER | D_CONFIG)
+#include <linux/statfs.h>
#include <obd.h>
#include <obd_class.h>
#include <lustre/lustre_user.h>
/*********** 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);
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),
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)
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);
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)
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,
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);
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);
static int lsi_prepare(struct lustre_sb_info *lsi)
{
+ const char *osd_type;
+ const char *fstype;
__u32 index;
int rc;
ENTRY;
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);
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,
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);
GOTO(out, rc);
obd = class_name2obd(lsi->lsi_osd_obdname);
LASSERT(obd);
+ } else {
+ CDEBUG(D_MOUNT, "%s already started\n", lsi->lsi_osd_obdname);
+ /* but continue setup to allow special case of MDT and internal
+ * MGT being started separately. */
+ if (!((IS_MGS(lsi) && (lsi->lsi_lmd->lmd_flags &
+ LMD_FLG_NOMGS)) ||
+ (IS_MDT(lsi) && (lsi->lsi_lmd->lmd_flags &
+ LMD_FLG_NOSVC))))
+ RETURN(-EALREADY);
}
rc = obd_connect(NULL, &lsi->lsi_osd_exp,
obd, &obd->obd_uuid, NULL, NULL);
+
+ OBD_FAIL_TIMEOUT(OBD_FAIL_TGT_DELAY_CONNECT, 10);
+
if (rc) {
obd->obd_force = 1;
class_manual_cleanup(obd);
obd->obd_recovery_time_hard = hard;
obd->obd_recovery_ir_factor = factor;
}
-EXPORT_SYMBOL(server_calc_timeout);