X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Fobd_mount.c;h=fe9de98d93a06125b8bd69e016118f12c69a2329;hp=fcac24ca58df172d5383a569a5af4e5aa99abc63;hb=a44174684d800d74d35d9eb0b1b65bcfd0dd8163;hpb=a3323a5af854bd792d573d3f9c88ac676de97af8 diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c index fcac24c..fe9de98 100644 --- a/lustre/obdclass/obd_mount.c +++ b/lustre/obdclass/obd_mount.c @@ -26,8 +26,10 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011, 2012, Whamcloud, Inc. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -56,22 +58,24 @@ #include #include -static int (*client_fill_super)(struct super_block *sb) = NULL; +static int (*client_fill_super)(struct super_block *sb, + struct vfsmount *mnt) = NULL; static void (*kill_super_cb)(struct super_block *sb) = NULL; /*********** mount lookup *********/ -DECLARE_MUTEX(lustre_mount_info_lock); +CFS_DEFINE_MUTEX(lustre_mount_info_lock); static CFS_LIST_HEAD(server_mount_info_list); static struct lustre_mount_info *server_find_mount(const char *name) { - struct list_head *tmp; + cfs_list_t *tmp; struct lustre_mount_info *lmi; ENTRY; - list_for_each(tmp, &server_mount_info_list) { - lmi = list_entry(tmp, struct lustre_mount_info, lmi_list_chain); + cfs_list_for_each(tmp, &server_mount_info_list) { + lmi = cfs_list_entry(tmp, struct lustre_mount_info, + lmi_list_chain); if (strcmp(name, lmi->lmi_name) == 0) RETURN(lmi); } @@ -101,10 +105,10 @@ static int server_register_mount(const char *name, struct super_block *sb, } strcpy(name_cp, name); - down(&lustre_mount_info_lock); + cfs_mutex_lock(&lustre_mount_info_lock); if (server_find_mount(name)) { - up(&lustre_mount_info_lock); + cfs_mutex_unlock(&lustre_mount_info_lock); OBD_FREE(lmi, sizeof(*lmi)); OBD_FREE(name_cp, strlen(name) + 1); CERROR("Already registered %s\n", name); @@ -113,12 +117,12 @@ static int server_register_mount(const char *name, struct super_block *sb, lmi->lmi_name = name_cp; lmi->lmi_sb = sb; lmi->lmi_mnt = mnt; - list_add(&lmi->lmi_list_chain, &server_mount_info_list); + cfs_list_add(&lmi->lmi_list_chain, &server_mount_info_list); - up(&lustre_mount_info_lock); + cfs_mutex_unlock(&lustre_mount_info_lock); CDEBUG(D_MOUNT, "reg_mnt %p from %s, vfscount=%d\n", - lmi->lmi_mnt, name, atomic_read(&lmi->lmi_mnt->mnt_count)); + lmi->lmi_mnt, name, mnt_get_count(lmi->lmi_mnt)); RETURN(0); } @@ -129,21 +133,21 @@ static int server_deregister_mount(const char *name) struct lustre_mount_info *lmi; ENTRY; - down(&lustre_mount_info_lock); + cfs_mutex_lock(&lustre_mount_info_lock); lmi = server_find_mount(name); if (!lmi) { - up(&lustre_mount_info_lock); + cfs_mutex_unlock(&lustre_mount_info_lock); CERROR("%s not registered\n", name); RETURN(-ENOENT); } CDEBUG(D_MOUNT, "dereg_mnt %p from %s, vfscount=%d\n", - lmi->lmi_mnt, name, atomic_read(&lmi->lmi_mnt->mnt_count)); + lmi->lmi_mnt, name, mnt_get_count(lmi->lmi_mnt)); OBD_FREE(lmi->lmi_name, strlen(lmi->lmi_name) + 1); - list_del(&lmi->lmi_list_chain); + cfs_list_del(&lmi->lmi_list_chain); OBD_FREE(lmi, sizeof(*lmi)); - up(&lustre_mount_info_lock); + cfs_mutex_unlock(&lustre_mount_info_lock); RETURN(0); } @@ -157,20 +161,20 @@ struct lustre_mount_info *server_get_mount(const char *name) struct lustre_sb_info *lsi; ENTRY; - down(&lustre_mount_info_lock); + cfs_mutex_lock(&lustre_mount_info_lock); lmi = server_find_mount(name); - up(&lustre_mount_info_lock); + cfs_mutex_unlock(&lustre_mount_info_lock); if (!lmi) { CERROR("Can't find mount for %s\n", name); RETURN(NULL); } lsi = s2lsi(lmi->lmi_sb); mntget(lmi->lmi_mnt); - atomic_inc(&lsi->lsi_mounts); + cfs_atomic_inc(&lsi->lsi_mounts); CDEBUG(D_MOUNT, "get_mnt %p from %s, refs=%d, vfscount=%d\n", - lmi->lmi_mnt, name, atomic_read(&lsi->lsi_mounts), - atomic_read(&lmi->lmi_mnt->mnt_count)); + lmi->lmi_mnt, name, cfs_atomic_read(&lsi->lsi_mounts), + mnt_get_count(lmi->lmi_mnt)); RETURN(lmi); } @@ -185,9 +189,9 @@ struct lustre_mount_info *server_get_mount_2(const char *name) struct lustre_mount_info *lmi; ENTRY; - down(&lustre_mount_info_lock); + cfs_mutex_lock(&lustre_mount_info_lock); lmi = server_find_mount(name); - up(&lustre_mount_info_lock); + cfs_mutex_unlock(&lustre_mount_info_lock); if (!lmi) CERROR("Can't find mount for %s\n", name); @@ -197,9 +201,9 @@ struct lustre_mount_info *server_get_mount_2(const char *name) static void unlock_mntput(struct vfsmount *mnt) { if (kernel_locked()) { - unlock_kernel(); + cfs_unlock_kernel(); mntput(mnt); - lock_kernel(); + cfs_lock_kernel(); } else { mntput(mnt); } @@ -212,15 +216,15 @@ int server_put_mount(const char *name, struct vfsmount *mnt) { struct lustre_mount_info *lmi; struct lustre_sb_info *lsi; - int count = atomic_read(&mnt->mnt_count) - 1; + int count = mnt_get_count(mnt) - 1; ENTRY; /* This might be the last one, can't deref after this */ unlock_mntput(mnt); - down(&lustre_mount_info_lock); + cfs_mutex_lock(&lustre_mount_info_lock); lmi = server_find_mount(name); - up(&lustre_mount_info_lock); + cfs_mutex_unlock(&lustre_mount_info_lock); if (!lmi) { CERROR("Can't find mount for %s\n", name); RETURN(-ENOENT); @@ -229,7 +233,7 @@ int server_put_mount(const char *name, struct vfsmount *mnt) LASSERT(lmi->lmi_mnt == mnt); CDEBUG(D_MOUNT, "put_mnt %p from %s, refs=%d, vfscount=%d\n", - lmi->lmi_mnt, name, atomic_read(&lsi->lsi_mounts), count); + lmi->lmi_mnt, name, cfs_atomic_read(&lsi->lsi_mounts), count); if (lustre_put_lsi(lmi->lmi_sb)) { CDEBUG(D_MOUNT, "Last put of mnt %p from %s, vfscount=%d\n", @@ -272,7 +276,7 @@ static void ldd_print(struct lustre_disk_data *ldd) #endif static int ldd_parse(struct lvfs_run_ctxt *mount_ctxt, - struct lustre_disk_data *ldd) + struct lustre_disk_data *ldd) { struct lvfs_run_ctxt saved; struct file *file; @@ -293,8 +297,8 @@ static int ldd_parse(struct lvfs_run_ctxt *mount_ctxt, len = i_size_read(file->f_dentry->d_inode); CDEBUG(D_MOUNT, "Have %s, size %lu\n", MOUNT_DATA_FILE, len); if (len != sizeof(*ldd)) { - CERROR("disk data size does not match: see %lu expect "LPSZ"\n", - len, sizeof(*ldd)); + CERROR("disk data size does not match: see %lu expect %u\n", + len, (int)sizeof(*ldd)); GOTO(out_close, rc = -EINVAL); } @@ -350,7 +354,7 @@ static int ldd_write(struct lvfs_run_ctxt *mount_ctxt, push_ctxt(&saved, mount_ctxt, NULL); - file = filp_open(MOUNT_DATA_FILE, O_RDWR, 0644); + file = filp_open(MOUNT_DATA_FILE, O_RDWR|O_SYNC, 0644); if (IS_ERR(file)) { rc = PTR_ERR(file); CERROR("cannot open %s: rc = %d\n", MOUNT_DATA_FILE, rc); @@ -376,16 +380,23 @@ out: /**************** config llog ********************/ -/* Get a config log from the MGS and process it. - This func is called for both clients and servers. - Continue to process new statements appended to the logs - (whenever the config lock is revoked) until lustre_end_log - is called. */ +/** Get a config log from the MGS and process it. + * This func is called for both clients and servers. + * Continue to process new statements appended to the logs + * (whenever the config lock is revoked) until lustre_end_log + * is called. + * @param sb The superblock is used by the MGC to write to the local copy of + * the config log + * @param logname The name of the llog to replicate from the MGS + * @param cfg Since the same mgc may be used to follow multiple config logs + * (e.g. ost1, ost2, client), the config_llog_instance keeps the state for + * this log, and is added to the mgc's list of logs to follow. + */ int lustre_process_log(struct super_block *sb, char *logname, struct config_llog_instance *cfg) { struct lustre_cfg *lcfg; - struct lustre_cfg_bufs bufs; + struct lustre_cfg_bufs *bufs; struct lustre_sb_info *lsi = s2lsi(sb); struct obd_device *mgc = lsi->lsi_mgc; int rc; @@ -394,15 +405,21 @@ int lustre_process_log(struct super_block *sb, char *logname, LASSERT(mgc); LASSERT(cfg); + OBD_ALLOC_PTR(bufs); + if (bufs == NULL) + RETURN(-ENOMEM); + /* mgc_process_config */ - lustre_cfg_bufs_reset(&bufs, mgc->obd_name); - lustre_cfg_bufs_set_string(&bufs, 1, logname); - lustre_cfg_bufs_set(&bufs, 2, cfg, sizeof(*cfg)); - lustre_cfg_bufs_set(&bufs, 3, &sb, sizeof(sb)); - lcfg = lustre_cfg_new(LCFG_LOG_START, &bufs); + lustre_cfg_bufs_reset(bufs, mgc->obd_name); + lustre_cfg_bufs_set_string(bufs, 1, logname); + lustre_cfg_bufs_set(bufs, 2, cfg, sizeof(*cfg)); + lustre_cfg_bufs_set(bufs, 3, &sb, sizeof(sb)); + lcfg = lustre_cfg_new(LCFG_LOG_START, bufs); rc = obd_process_config(mgc, sizeof(*lcfg), lcfg); lustre_cfg_free(lcfg); + OBD_FREE_PTR(bufs); + if (rc == -EINVAL) LCONSOLE_ERROR_MSG(0x15b, "%s: The configuration from log '%s'" "failed from the MGS (%d). Make sure this " @@ -450,6 +467,9 @@ int lustre_end_log(struct super_block *sb, char *logname, /**************** obd start *******************/ +/** lustre_cfg_bufs are a holdover from 1.4; we can still set these up from + * lctl (and do for echo cli/srv. + */ int do_lcfg(char *cfgname, lnet_nid_t nid, int cmd, char *s1, char *s2, char *s3, char *s4) { @@ -477,6 +497,9 @@ int do_lcfg(char *cfgname, lnet_nid_t nid, int cmd, return(rc); } +/** Call class_attach and class_setup. These methods in turn call + * obd type-specific methods. + */ static int lustre_start_simple(char *obdname, char *type, char *uuid, char *s1, char *s2) { @@ -521,10 +544,13 @@ static int server_start_mgs(struct super_block *sb) rc = server_register_mount(LUSTRE_MGS_OBDNAME, sb, mnt); - if (!rc && - ((rc = lustre_start_simple(LUSTRE_MGS_OBDNAME, LUSTRE_MGS_NAME, - LUSTRE_MGS_OBDNAME, 0, 0)))) - server_deregister_mount(LUSTRE_MGS_OBDNAME); + if (!rc) { + rc = lustre_start_simple(LUSTRE_MGS_OBDNAME, LUSTRE_MGS_NAME, + LUSTRE_MGS_OBDNAME, 0, 0); + /* Do NOT call server_deregister_mount() here. This leads to + * inability cleanup cleanly and free lsi and other stuff when + * mgs calls server_put_mount() in error handling case. -umka */ + } if (rc) LCONSOLE_ERROR_MSG(0x15e, "Failed to start MGS '%s' (%d). " @@ -554,7 +580,7 @@ static int server_stop_mgs(struct super_block *sb) RETURN(rc); } -DECLARE_MUTEX(mgc_start_lock); +CFS_DEFINE_MUTEX(mgc_start_lock); /** Set up a mgc obd to process startup logs * @@ -564,7 +590,6 @@ DECLARE_MUTEX(mgc_start_lock); */ static int lustre_start_mgc(struct super_block *sb) { - struct lustre_handle mgc_conn = {0, }; struct obd_connect_data *data = NULL; struct lustre_sb_info *lsi = s2lsi(sb); struct obd_device *obd; @@ -572,7 +597,7 @@ static int lustre_start_mgc(struct super_block *sb) struct obd_uuid *uuid; class_uuid_t uuidc; lnet_nid_t nid; - char *mgcname, *niduuid; + char *mgcname = NULL, *niduuid = NULL, *mgssec = NULL; char *ptr; int recov_bk; int rc = 0, i = 0, j, len; @@ -608,6 +633,8 @@ static int lustre_start_mgc(struct super_block *sb) RETURN(-EINVAL); } + cfs_mutex_lock(&mgc_start_lock); + len = strlen(LUSTRE_MGC_OBDNAME) + strlen(libcfs_nid2str(nid)) + 1; OBD_ALLOC(mgcname, len); OBD_ALLOC(niduuid, len + 2); @@ -615,12 +642,48 @@ static int lustre_start_mgc(struct super_block *sb) GOTO(out_free, rc = -ENOMEM); sprintf(mgcname, "%s%s", LUSTRE_MGC_OBDNAME, libcfs_nid2str(nid)); - mutex_down(&mgc_start_lock); + mgssec = lsi->lsi_lmd->lmd_mgssec ? lsi->lsi_lmd->lmd_mgssec : ""; + + OBD_ALLOC_PTR(data); + if (data == NULL) + GOTO(out_free, rc = -ENOMEM); obd = class_name2obd(mgcname); if (obd && !obd->obd_stopping) { + rc = obd_set_info_async(obd->obd_self_export, + strlen(KEY_MGSSEC), KEY_MGSSEC, + strlen(mgssec), mgssec, NULL); + if (rc) + GOTO(out_free, rc); + /* Re-using an existing MGC */ - atomic_inc(&obd->u.cli.cl_mgc_refcount); + cfs_atomic_inc(&obd->u.cli.cl_mgc_refcount); + + /* IR compatibility check, only for clients */ + if (lmd_is_client(lsi->lsi_lmd)) { + int has_ir; + int vallen = sizeof(*data); + __u32 *flags = &lsi->lsi_lmd->lmd_flags; + + rc = obd_get_info(obd->obd_self_export, + strlen(KEY_CONN_DATA), KEY_CONN_DATA, + &vallen, data, NULL); + LASSERT(rc == 0); + has_ir = OCD_HAS_FLAG(data, IMP_RECOV); + if (has_ir ^ !(*flags & LMD_FLG_NOIR)) { + /* LMD_FLG_NOIR is for test purpose only */ + LCONSOLE_WARN( + "Trying to mount a client with IR setting " + "not compatible with current mgc. " + "Force to use current mgc setting that is " + "IR %s.\n", + has_ir ? "enabled" : "disabled"); + if (has_ir) + *flags &= ~LMD_FLG_NOIR; + else + *flags |= LMD_FLG_NOIR; + } + } recov_bk = 0; /* If we are restarting the MGS, don't try to keep the MGC's @@ -731,9 +794,15 @@ static int lustre_start_mgc(struct super_block *sb) GOTO(out_free, rc = -ENOTCONN); } + rc = obd_set_info_async(obd->obd_self_export, + strlen(KEY_MGSSEC), KEY_MGSSEC, + strlen(mgssec), mgssec, NULL); + if (rc) + GOTO(out_free, rc); + /* Keep a refcount of servers/clients who started with "mount", so we know when we can get rid of the mgc. */ - atomic_set(&obd->u.cli.cl_mgc_refcount, 1); + cfs_atomic_set(&obd->u.cli.cl_mgc_refcount, 1); /* Try all connections, but only once. */ recov_bk = 1; @@ -745,20 +814,19 @@ static int lustre_start_mgc(struct super_block *sb) /* nonfatal */ CWARN("can't set %s %d\n", KEY_INIT_RECOV_BACKUP, rc); /* We connect to the MGS at setup, and don't disconnect until cleanup */ - OBD_ALLOC_PTR(data); - if (data == NULL) - GOTO(out, rc = -ENOMEM); data->ocd_connect_flags = OBD_CONNECT_VERSION | OBD_CONNECT_FID | - OBD_CONNECT_AT; + OBD_CONNECT_AT | OBD_CONNECT_FULL20 | + OBD_CONNECT_IMP_RECOV; + if (lmd_is_client(lsi->lsi_lmd) && + lsi->lsi_lmd->lmd_flags & LMD_FLG_NOIR) + data->ocd_connect_flags &= ~OBD_CONNECT_IMP_RECOV; data->ocd_version = LUSTRE_VERSION_CODE; - rc = obd_connect(NULL, &mgc_conn, obd, &(obd->obd_uuid), data, NULL); - OBD_FREE_PTR(data); + rc = obd_connect(NULL, &exp, obd, &(obd->obd_uuid), data, NULL); if (rc) { CERROR("connect failed %d\n", rc); GOTO(out, rc); } - exp = class_conn2export(&mgc_conn); obd->u.cli.cl_mgc_mgsexp = exp; out: @@ -766,8 +834,10 @@ out: to the same mgc.*/ lsi->lsi_mgc = obd; out_free: - mutex_up(&mgc_start_lock); + cfs_mutex_unlock(&mgc_start_lock); + if (data) + OBD_FREE_PTR(data); if (mgcname) OBD_FREE(mgcname, len); if (niduuid) @@ -790,13 +860,13 @@ static int lustre_stop_mgc(struct super_block *sb) RETURN(-ENOENT); lsi->lsi_mgc = NULL; - mutex_down(&mgc_start_lock); - LASSERT(atomic_read(&obd->u.cli.cl_mgc_refcount) > 0); - if (!atomic_dec_and_test(&obd->u.cli.cl_mgc_refcount)) { + cfs_mutex_lock(&mgc_start_lock); + LASSERT(cfs_atomic_read(&obd->u.cli.cl_mgc_refcount) > 0); + if (!cfs_atomic_dec_and_test(&obd->u.cli.cl_mgc_refcount)) { /* This is not fatal, every client that stops will call in here. */ CDEBUG(D_MOUNT, "mgc still has %d references.\n", - atomic_read(&obd->u.cli.cl_mgc_refcount)); + cfs_atomic_read(&obd->u.cli.cl_mgc_refcount)); GOTO(out, rc = -EBUSY); } @@ -842,7 +912,7 @@ out: OBD_FREE(niduuid, len); /* class_import_put will get rid of the additional connections */ - mutex_up(&mgc_start_lock); + cfs_mutex_unlock(&mgc_start_lock); RETURN(rc); } @@ -880,7 +950,7 @@ static int server_mgc_clear_fs(struct obd_device *mgc) RETURN(rc); } -DECLARE_MUTEX(server_start_lock); +CFS_DEFINE_MUTEX(server_start_lock); /* Stop MDS/OSS if nobody is using them */ static int server_stop_servers(int lddflags, int lsiflags) @@ -890,7 +960,7 @@ static int server_stop_servers(int lddflags, int lsiflags) int rc = 0; ENTRY; - mutex_down(&server_start_lock); + cfs_mutex_lock(&server_start_lock); /* Either an MDT or an OST or neither */ /* if this was an MDT, and there are no more MDT's, clean up the MDS */ @@ -914,7 +984,7 @@ static int server_stop_servers(int lddflags, int lsiflags) rc = err; } - mutex_up(&server_start_lock); + cfs_mutex_unlock(&server_start_lock); RETURN(rc); } @@ -935,7 +1005,7 @@ static int server_sb2mti(struct super_block *sb, struct mgs_target_info *mti) struct lustre_sb_info *lsi = s2lsi(sb); struct lustre_disk_data *ldd = lsi->lsi_ldd; lnet_process_id_t id; - int i = 0; + int i = 0; ENTRY; if (!(lsi->lsi_flags & LSI_SERVER)) @@ -950,6 +1020,19 @@ static int server_sb2mti(struct super_block *sb, struct mgs_target_info *mti) while (LNetGetId(i++, &id) != -ENOENT) { if (LNET_NETTYP(LNET_NIDNET(id.nid)) == LOLND) continue; + + /* server use --servicenode param, only allow specified + * nids be registered */ + if ((ldd->ldd_flags & LDD_F_NO_PRIMNODE) != 0 && + class_match_nid(ldd->ldd_params, + PARAM_FAILNODE, id.nid) < 1) + continue; + + /* match specified network */ + if (!class_match_net(ldd->ldd_params, + PARAM_NETWORK, LNET_NIDNET(id.nid))) + continue; + mti->mti_nids[mti->mti_nid_count] = id.nid; mti->mti_nid_count++; if (mti->mti_nid_count >= MTI_NIDS_MAX) { @@ -961,6 +1044,8 @@ static int server_sb2mti(struct super_block *sb, struct mgs_target_info *mti) mti->mti_lustre_ver = LUSTRE_VERSION_CODE; mti->mti_config_ver = 0; + if (lsi->lsi_lmd->lmd_flags & LMD_FLG_WRITECONF) + ldd->ldd_flags |= LDD_F_WRITECONF; mti->mti_flags = ldd->ldd_flags; mti->mti_stripe_index = ldd->ldd_svindex; memcpy(mti->mti_uuid, ldd->ldd_uuid, sizeof(mti->mti_uuid)); @@ -980,6 +1065,7 @@ int server_register_target(struct super_block *sb) struct obd_device *mgc = lsi->lsi_mgc; struct lustre_disk_data *ldd = lsi->lsi_ldd; struct mgs_target_info *mti = NULL; + bool writeconf; int rc; ENTRY; @@ -1000,16 +1086,35 @@ int server_register_target(struct super_block *sb) libcfs_nid2str(mti->mti_nids[0]), mti->mti_stripe_index, mti->mti_flags); + /* if write_conf is true, the registration must succeed */ + writeconf = !!(ldd->ldd_flags & (LDD_F_NEED_INDEX | LDD_F_UPDATE)); + mti->mti_flags |= LDD_F_OPC_REG; + /* Register the target */ /* FIXME use mgc_process_config instead */ rc = obd_set_info_async(mgc->u.cli.cl_mgc_mgsexp, sizeof(KEY_REGISTER_TARGET), KEY_REGISTER_TARGET, sizeof(*mti), mti, NULL); - if (rc) + if (rc) { + if (mti->mti_flags & LDD_F_ERROR) { + LCONSOLE_ERROR_MSG(0x160, + "The MGS is refusing to allow this " + "server (%s) to start. Please see messages" + " on the MGS node.\n", ldd->ldd_svname); + } else if (writeconf) { + LCONSOLE_ERROR_MSG(0x15f, + "Communication to the MGS return error %d. " + "Is the MGS running?\n", rc); + } else { + CERROR("Cannot talk to the MGS: %d, not fatal\n", rc); + /* reset the error code for non-fatal error. */ + rc = 0; + } GOTO(out, rc); + } /* Always update our flags */ - ldd->ldd_flags = mti->mti_flags & ~LDD_F_REWRITE_LDD; + ldd->ldd_flags = mti->mti_flags & LDD_F_ONDISK_MASK; /* If this flag is set, it means the MGS wants us to change our on-disk data. (So far this means just the index.) */ @@ -1042,7 +1147,53 @@ out: RETURN(rc); } -/* Start targets */ +/** + * Notify the MGS that this target is ready. + * Used by IR - if the MGS receives this message, it will notify clients. + */ +static int server_notify_target(struct super_block *sb, struct obd_device *obd) +{ + struct lustre_sb_info *lsi = s2lsi(sb); + struct obd_device *mgc = lsi->lsi_mgc; + struct mgs_target_info *mti = NULL; + int rc; + ENTRY; + + LASSERT(mgc); + + if (!(lsi->lsi_flags & LSI_SERVER)) + RETURN(-EINVAL); + + OBD_ALLOC_PTR(mti); + if (!mti) + RETURN(-ENOMEM); + rc = server_sb2mti(sb, mti); + if (rc) + GOTO(out, rc); + + mti->mti_instance = obd->u.obt.obt_instance; + mti->mti_flags |= LDD_F_OPC_READY; + + /* FIXME use mgc_process_config instead */ + rc = obd_set_info_async(mgc->u.cli.cl_mgc_mgsexp, + sizeof(KEY_REGISTER_TARGET), + KEY_REGISTER_TARGET, + sizeof(*mti), mti, NULL); + + /* Imperative recovery: if the mgs informs us to use IR? */ + if (!rc && !(mti->mti_flags & LDD_F_ERROR) && + (mti->mti_flags & LDD_F_IR_CAPABLE)) + lsi->lsi_flags |= LSI_IR_CAPABLE; + +out: + if (mti) + OBD_FREE_PTR(mti); + RETURN(rc); + +} + +/** Start server targets: MDTs and OSTs + */ static int server_start_targets(struct super_block *sb, struct vfsmount *mnt) { struct obd_device *obd; @@ -1057,7 +1208,7 @@ static int server_start_targets(struct super_block *sb, struct vfsmount *mnt) /* If we're an MDT, make sure the global MDS is running */ if (lsi->lsi_ldd->ldd_flags & LDD_F_SV_TYPE_MDT) { /* make sure the MDS is started */ - mutex_down(&server_start_lock); + cfs_mutex_lock(&server_start_lock); obd = class_name2obd(LUSTRE_MDS_OBDNAME); if (!obd) { rc = lustre_start_simple(LUSTRE_MDS_OBDNAME, @@ -1066,19 +1217,19 @@ static int server_start_targets(struct super_block *sb, struct vfsmount *mnt) LUSTRE_MDS_OBDNAME"_uuid", 0, 0); if (rc) { - mutex_up(&server_start_lock); + cfs_mutex_unlock(&server_start_lock); CERROR("failed to start MDS: %d\n", rc); RETURN(rc); } } - mutex_up(&server_start_lock); + cfs_mutex_unlock(&server_start_lock); } #endif /* If we're an OST, make sure the global OSS is running */ - if (lsi->lsi_ldd->ldd_flags & LDD_F_SV_TYPE_OST) { + if (IS_OST(lsi->lsi_ldd)) { /* make sure OSS is started */ - mutex_down(&server_start_lock); + cfs_mutex_lock(&server_start_lock); obd = class_name2obd(LUSTRE_OSS_OBDNAME); if (!obd) { rc = lustre_start_simple(LUSTRE_OSS_OBDNAME, @@ -1086,42 +1237,24 @@ static int server_start_targets(struct super_block *sb, struct vfsmount *mnt) LUSTRE_OSS_OBDNAME"_uuid", 0, 0); if (rc) { - mutex_up(&server_start_lock); + cfs_mutex_unlock(&server_start_lock); CERROR("failed to start OSS: %d\n", rc); RETURN(rc); } } - mutex_up(&server_start_lock); + cfs_mutex_unlock(&server_start_lock); } - /* Set the mgc fs to our server disk. This allows the MGC - to read and write configs locally. */ + /* Set the mgc fs to our server disk. This allows the MGC to + * read and write configs locally, in case it can't talk to the MGS. */ rc = server_mgc_set_fs(lsi->lsi_mgc, sb); if (rc) RETURN(rc); /* Register with MGS */ rc = server_register_target(sb); - if (rc && (lsi->lsi_ldd->ldd_flags & - (LDD_F_NEED_INDEX | LDD_F_UPDATE | LDD_F_UPGRADE14))){ - CERROR("Required registration failed for %s: %d\n", - lsi->lsi_ldd->ldd_svname, rc); - if (rc == -EIO) { - LCONSOLE_ERROR_MSG(0x15f, "Communication error with " - "the MGS. Is the MGS running?\n"); - } - GOTO(out_mgc, rc); - } - if (rc == -EINVAL) { - LCONSOLE_ERROR_MSG(0x160, "The MGS is refusing to allow this " - "server (%s) to start. Please see messages" - " on the MGS node.\n", - lsi->lsi_ldd->ldd_svname); - GOTO(out_mgc, rc); - } - /* non-fatal error of registeration with MGS */ if (rc) - CDEBUG(D_MOUNT, "Cannot register with MGS: %d\n", rc); + GOTO(out_mgc, rc); /* Let the target look up the mount using the target's name (we can't pass the sb or mnt through class_process_config.) */ @@ -1135,6 +1268,9 @@ static int server_start_targets(struct super_block *sb, struct vfsmount *mnt) if (rc) { CERROR("failed to start server %s: %d\n", lsi->lsi_ldd->ldd_svname, rc); + /* Do NOT call server_deregister_mount() here. This makes it + * impossible to find mount later in cleanup time and leaves + * @lsi and othder stuff leaked. -umka */ GOTO(out_mgc, rc); } @@ -1156,6 +1292,11 @@ out_mgc: obd->obd_self_export, 0, NULL, NULL); } + server_notify_target(sb, obd); + + /* calculate recovery timeout, do it after lustre_process_log */ + server_calc_timeout(lsi, obd); + /* log has been fully processed */ obd_notify(obd, NULL, OBD_NOTIFY_CONFIG, (void *)CONFIG_LOG); } @@ -1180,9 +1321,11 @@ struct lustre_sb_info *lustre_init_lsi(struct super_block *sb) } lsi->lsi_lmd->lmd_exclude_count = 0; + lsi->lsi_lmd->lmd_recovery_time_soft = 0; + lsi->lsi_lmd->lmd_recovery_time_hard = 0; s2lsi_nocast(sb) = lsi; /* we take 1 extra ref for our setup */ - atomic_set(&lsi->lsi_mounts, 1); + cfs_atomic_set(&lsi->lsi_mounts, 1); /* Default umount style */ lsi->lsi_flags = LSI_UMOUNT_FAILOVER; @@ -1199,7 +1342,7 @@ static int lustre_free_lsi(struct super_block *sb) CDEBUG(D_MOUNT, "Freeing lsi %p\n", lsi); /* someone didn't call server_put_mount. */ - LASSERT(atomic_read(&lsi->lsi_mounts) == 0); + LASSERT(cfs_atomic_read(&lsi->lsi_mounts) == 0); if (lsi->lsi_ldd != NULL) OBD_FREE(lsi->lsi_ldd, sizeof(*lsi->lsi_ldd)); @@ -1211,6 +1354,9 @@ static int lustre_free_lsi(struct super_block *sb) if (lsi->lsi_lmd->lmd_profile != NULL) OBD_FREE(lsi->lsi_lmd->lmd_profile, strlen(lsi->lsi_lmd->lmd_profile) + 1); + if (lsi->lsi_lmd->lmd_mgssec != NULL) + OBD_FREE(lsi->lsi_lmd->lmd_mgssec, + strlen(lsi->lsi_lmd->lmd_mgssec) + 1); if (lsi->lsi_lmd->lmd_opts != NULL) OBD_FREE(lsi->lsi_lmd->lmd_opts, strlen(lsi->lsi_lmd->lmd_opts) + 1); @@ -1237,8 +1383,8 @@ static int lustre_put_lsi(struct super_block *sb) LASSERT(lsi != NULL); - CDEBUG(D_MOUNT, "put %p %d\n", sb, atomic_read(&lsi->lsi_mounts)); - if (atomic_dec_and_test(&lsi->lsi_mounts)) { + CDEBUG(D_MOUNT, "put %p %d\n", sb, cfs_atomic_read(&lsi->lsi_mounts)); + if (cfs_atomic_dec_and_test(&lsi->lsi_mounts)) { lustre_free_lsi(sb); RETURN(1); } @@ -1247,7 +1393,11 @@ static int lustre_put_lsi(struct super_block *sb) /*************** server mount ******************/ -/* Kernel mount using mount options in MOUNT_DATA_FILE */ +/** Kernel mount using mount options in MOUNT_DATA_FILE. + * Since this file lives on the disk, we pre-mount using a common + * type, read the file, then re-mount using the type specified in the + * file. + */ static struct vfsmount *server_kernel_mount(struct super_block *sb) { struct lvfs_run_ctxt mount_ctxt; @@ -1258,6 +1408,7 @@ static struct vfsmount *server_kernel_mount(struct super_block *sb) char *options = NULL; unsigned long page, s_flags; struct page *__page; + int len; int rc; ENTRY; @@ -1313,11 +1464,15 @@ static struct vfsmount *server_kernel_mount(struct super_block *sb) memset(options, 0, CFS_PAGE_SIZE); strncpy(options, ldd->ldd_mount_opts, CFS_PAGE_SIZE - 2); + len = CFS_PAGE_SIZE - strlen(options) - 2; + if (*options != 0) + strcat(options, ","); + strncat(options, "no_mbcache", len); + /* Add in any mount-line options */ if (lmd->lmd_opts && (*(lmd->lmd_opts) != 0)) { - int len = CFS_PAGE_SIZE - strlen(options) - 2; - if (*options != 0) - strcat(options, ","); + len = CFS_PAGE_SIZE - strlen(options) - 2; + strcat(options, ","); strncat(options, lmd->lmd_opts, len); } @@ -1335,6 +1490,10 @@ static struct vfsmount *server_kernel_mount(struct super_block *sb) GOTO(out_free, rc); } + if (lmd->lmd_flags & LMD_FLG_ABORT_RECOV) + simple_truncate(mnt->mnt_sb->s_root, mnt, LAST_RCVD, + LR_CLIENT_START); + OBD_PAGE_FREE(__page); lsi->lsi_ldd = ldd; /* freed at lsi cleanup */ CDEBUG(D_SUPER, "%s: mnt = %p\n", lmd->lmd_dev, mnt); @@ -1348,30 +1507,45 @@ out_free: RETURN(ERR_PTR(rc)); } +/** Wait here forever until the mount refcount is 0 before completing umount, + * else we risk dereferencing a null pointer. + * LNET may take e.g. 165s before killing zombies. + */ static void server_wait_finished(struct vfsmount *mnt) { - wait_queue_head_t waitq; - struct l_wait_info lwi; - int retries = 330; - - init_waitqueue_head(&waitq); - - while ((atomic_read(&mnt->mnt_count) > 1) && (retries > 0)) { - LCONSOLE_WARN("Mount still busy with %d refs, waiting for " - "%d secs...\n", - atomic_read(&mnt->mnt_count), retries); - - /* Wait for a bit */ - retries -= 5; - lwi = LWI_TIMEOUT(5 * HZ, NULL, NULL); - l_wait_event(waitq, 0, &lwi); - } - if (atomic_read(&mnt->mnt_count) > 1) { - CERROR("Mount %p is still busy (%d refs), giving up.\n", - mnt, atomic_read(&mnt->mnt_count)); - } + cfs_waitq_t waitq; + int rc, waited = 0; + cfs_sigset_t blocked; + + cfs_waitq_init(&waitq); + + while (mnt_get_count(mnt) > 1) { + if (waited && (waited % 30 == 0)) + LCONSOLE_WARN("Mount still busy with %d refs after " + "%d secs.\n", + mnt_get_count(mnt), + waited); + /* Cannot use l_event_wait() for an interruptible sleep. */ + waited += 3; + blocked = cfs_block_sigsinv(sigmask(SIGKILL)); + cfs_waitq_wait_event_interruptible_timeout( + waitq, + (mnt_get_count(mnt) == 1), + cfs_time_seconds(3), + rc); + cfs_block_sigs(blocked); + if (rc < 0) { + LCONSOLE_EMERG("Danger: interrupted umount %s with " + "%d refs!\n", mnt->mnt_devname, + mnt_get_count(mnt)); + break; + } + + } } +/** Start the shutdown of servers at umount. + */ static void server_put_super(struct super_block *sb) { struct lustre_sb_info *lsi = s2lsi(sb); @@ -1389,6 +1563,8 @@ static void server_put_super(struct super_block *sb) OBD_ALLOC(tmpname, tmpname_sz); memcpy(tmpname, lsi->lsi_ldd->ldd_svname, tmpname_sz); CDEBUG(D_MOUNT, "server put_super %s\n", tmpname); + if (IS_MDT(lsi->lsi_ldd) && (lsi->lsi_lmd->lmd_flags & LMD_FLG_NOSVC)) + snprintf(tmpname, tmpname_sz, "MGS"); /* Stop the target */ if (!(lsi->lsi_lmd->lmd_flags & LMD_FLG_NOSVC) && @@ -1426,8 +1602,23 @@ static void server_put_super(struct super_block *sb) should have put it on a different device. */ if (IS_MGS(lsi->lsi_ldd)) { /* if MDS start with --nomgs, don't stop MGS then */ - if (!(lsi->lsi_lmd->lmd_flags & LMD_FLG_NOMGS)) + if (!(lsi->lsi_lmd->lmd_flags & LMD_FLG_NOMGS)) { + char *logname; + + OBD_ALLOC(logname, MGS_PARAM_MAXLEN); + if (!logname) { + LCONSOLE_WARN("Stopping mgs failed %d, please " + "try again.", -ENOMEM); + return; + } + strcpy(logname, lsi->lsi_ldd->ldd_fsname); + strcat(logname, "-params"); + /* tell the mgc to drop parameter config log */ + lustre_end_log(sb, logname, NULL); + OBD_FREE(logname, MGS_PARAM_MAXLEN); + server_stop_mgs(sb); + } } /* Clean the mgc and sb */ @@ -1461,6 +1652,8 @@ static void server_put_super(struct super_block *sb) EXIT; } +/** Called only for 'umount -f' + */ #ifdef HAVE_UMOUNTBEGIN_VFSMOUNT static void server_umount_begin(struct vfsmount *vfsmnt, int flags) { @@ -1489,10 +1682,10 @@ static void server_umount_begin(struct super_block *sb) } #ifndef HAVE_STATFS_DENTRY_PARAM -static int server_statfs (struct super_block *sb, struct kstatfs *buf) +static int server_statfs (struct super_block *sb, cfs_kstatfs_t *buf) { #else -static int server_statfs (struct dentry *dentry, struct kstatfs *buf) +static int server_statfs (struct dentry *dentry, cfs_kstatfs_t *buf) { struct super_block *sb = dentry->d_sb; #endif @@ -1523,6 +1716,9 @@ static int server_statfs (struct dentry *dentry, struct kstatfs *buf) RETURN(0); } +/** The operations we support directly on the superblock: + * mount, umount, and df. + */ static struct super_operations server_ops = { .put_super = server_put_super, @@ -1530,7 +1726,7 @@ static struct super_operations server_ops = .statfs = server_statfs, }; -#define log2(n) ffz(~(n)) +#define log2(n) cfs_ffz(~(n)) #define LUSTRE_SUPER_MAGIC 0x0BD00BD1 static int server_fill_super_common(struct super_block *sb) @@ -1543,7 +1739,7 @@ static int server_fill_super_common(struct super_block *sb) sb->s_blocksize = 4096; sb->s_blocksize_bits = log2(sb->s_blocksize); sb->s_magic = LUSTRE_SUPER_MAGIC; - sb->s_maxbytes = 0; //PAGE_CACHE_MAXBYTES; + sb->s_maxbytes = 0; /* we don't allow file IO on server mountpoints */ sb->s_flags |= MS_RDONLY; sb->s_op = &server_ops; @@ -1568,6 +1764,11 @@ static int server_fill_super_common(struct super_block *sb) RETURN(0); } +/** Fill in the superblock info for a Lustre server. + * Mount the device with the correct options. + * Read the on-disk config file. + * Start the services. + */ static int server_fill_super(struct super_block *sb) { struct lustre_sb_info *lsi = s2lsi(sb); @@ -1602,12 +1803,13 @@ static int server_fill_super(struct super_block *sb) } /* Start MGS before MGC */ - if (IS_MGS(lsi->lsi_ldd) && !(lsi->lsi_lmd->lmd_flags & LMD_FLG_NOMGS)) { + if (IS_MGS(lsi->lsi_ldd) && !(lsi->lsi_lmd->lmd_flags & LMD_FLG_NOMGS)){ rc = server_start_mgs(sb); if (rc) GOTO(out_mnt, rc); } + /* Start MGC before servers */ rc = lustre_start_mgc(sb); if (rc) GOTO(out_mnt, rc); @@ -1629,15 +1831,31 @@ static int server_fill_super(struct super_block *sb) Client will not finish until all servers are connected. Note - MGS-only server does NOT get a client, since there is no lustre fs associated - the MGS is for all lustre fs's */ + } else if (IS_MGS(lsi->lsi_ldd) && + !(lsi->lsi_lmd->lmd_flags & LMD_FLG_NOMGS)){ + struct config_llog_instance cfg; + char *logname; + + OBD_ALLOC(logname, MGS_PARAM_MAXLEN); + if (logname == NULL) + GOTO(out_mnt, rc = -ENOMEM); + strcpy(logname, lsi->lsi_ldd->ldd_fsname); + strcat(logname, "-params"); + + memset(&cfg, 0, sizeof(cfg)); + rc = lustre_process_log(sb, logname, &cfg); + OBD_FREE(logname, MGS_PARAM_MAXLEN); + if (rc) { + CERROR("failed to process parameters %s: %d\n", + logname, rc); + GOTO(out_mnt, rc); + } } rc = server_fill_super_common(sb); if (rc) GOTO(out_mnt, rc); - LCONSOLE_WARN("Server %s on device %s has started\n", - lsi->lsi_ldd->ldd_svname, lsi->lsi_lmd->lmd_dev); - RETURN(0); out_mnt: /* We jump here in case of failure while starting targets or MGS. @@ -1655,22 +1873,93 @@ int server_name2index(char *svname, __u32 *idx, char **endptr) { unsigned long index; int rc; - char *dash = strchr(svname, '-'); + char *dash = strrchr(svname, '-'); if (!dash) return(-EINVAL); + /* intepret -MDTXXXXX-mdc as mdt, the better way is to pass + * in the fsname, then determine the server index */ + if (!strcmp(LUSTRE_MDC_NAME, dash + 1)) { + dash--; + for (; dash > svname && *dash != '-'; dash--); + if (dash == svname) + return(-EINVAL); + } + if (strncmp(dash + 1, "MDT", 3) == 0) rc = LDD_F_SV_TYPE_MDT; else if (strncmp(dash + 1, "OST", 3) == 0) rc = LDD_F_SV_TYPE_OST; else return(-EINVAL); + if (strcmp(dash + 4, "all") == 0) + return rc | LDD_F_SV_ALL; index = simple_strtoul(dash + 4, endptr, 16); *idx = index; return rc; } +/* + * Calculate timeout value for a target. + */ +void server_calc_timeout(struct lustre_sb_info *lsi, struct obd_device *obd) +{ + struct lustre_mount_data *lmd; + int soft = 0; + int hard = 0; + int factor = 0; + bool has_ir = !!(lsi->lsi_flags & LSI_IR_CAPABLE); + int min = OBD_RECOVERY_TIME_MIN; + + LASSERT(lsi->lsi_flags & LSI_SERVER); + + lmd = lsi->lsi_lmd; + if (lmd) { + soft = lmd->lmd_recovery_time_soft; + hard = lmd->lmd_recovery_time_hard; + has_ir = has_ir && !(lmd->lmd_flags & LMD_FLG_NOIR); + obd->obd_no_ir = !has_ir; + } + + if (soft == 0) + soft = OBD_RECOVERY_TIME_SOFT; + if (hard == 0) + hard = OBD_RECOVERY_TIME_HARD; + + /* target may have ir_factor configured. */ + factor = OBD_IR_FACTOR_DEFAULT; + if (obd->obd_recovery_ir_factor) + factor = obd->obd_recovery_ir_factor; + + if (has_ir) { + int new_soft = soft; + int new_hard = hard; + + /* adjust timeout value by imperative recovery */ + + new_soft = (soft * factor) / OBD_IR_FACTOR_MAX; + new_hard = (hard * factor) / OBD_IR_FACTOR_MAX; + + /* make sure the timeout is not too short */ + new_soft = max(min, new_soft); + new_hard = max(new_soft, new_hard); + + LCONSOLE_INFO("%s: Imperative Recovery enabled, recovery " + "window shrunk from %d-%d down to %d-%d\n", + obd->obd_name, soft, hard, new_soft, new_hard); + + soft = new_soft; + hard = new_hard; + } + + /* we're done */ + obd->obd_recovery_timeout = max(obd->obd_recovery_timeout, soft); + obd->obd_recovery_time_hard = hard; + obd->obd_recovery_ir_factor = factor; +} +EXPORT_SYMBOL(server_calc_timeout); + /*************** mount common betweeen server and client ***************/ /* Common umount */ @@ -1698,7 +1987,6 @@ int lustre_common_put_super(struct super_block *sb) RETURN(rc); } -#if 0 static void lmd_print(struct lustre_mount_data *lmd) { int i; @@ -1708,14 +1996,23 @@ static void lmd_print(struct lustre_mount_data *lmd) PRINT_CMD(PRINT_MASK, "profile: %s\n", lmd->lmd_profile); PRINT_CMD(PRINT_MASK, "device: %s\n", lmd->lmd_dev); PRINT_CMD(PRINT_MASK, "flags: %x\n", lmd->lmd_flags); + if (lmd->lmd_opts) PRINT_CMD(PRINT_MASK, "options: %s\n", lmd->lmd_opts); + + if (lmd->lmd_recovery_time_soft) + PRINT_CMD(PRINT_MASK, "recovery time soft: %d\n", + lmd->lmd_recovery_time_soft); + + if (lmd->lmd_recovery_time_hard) + PRINT_CMD(PRINT_MASK, "recovery time hard: %d\n", + lmd->lmd_recovery_time_hard); + for (i = 0; i < lmd->lmd_exclude_count; i++) { PRINT_CMD(PRINT_MASK, "exclude %d: OST%04x\n", i, lmd->lmd_exclude[i]); } } -#endif /* Is this server on the exclusion list */ int lustre_check_exclusion(struct super_block *sb, char *svname) @@ -1798,7 +2095,35 @@ static int lmd_make_exclusion(struct lustre_mount_data *lmd, char *ptr) RETURN(rc); } -/* mount -v -t lustre uml1:uml2:/lustre-client /mnt/lustre */ +static int lmd_parse_mgssec(struct lustre_mount_data *lmd, char *ptr) +{ + char *tail; + int length; + + if (lmd->lmd_mgssec != NULL) { + OBD_FREE(lmd->lmd_mgssec, strlen(lmd->lmd_mgssec) + 1); + lmd->lmd_mgssec = NULL; + } + + tail = strchr(ptr, ','); + if (tail == NULL) + length = strlen(ptr); + else + length = tail - ptr; + + OBD_ALLOC(lmd->lmd_mgssec, length + 1); + if (lmd->lmd_mgssec == NULL) + return -ENOMEM; + + memcpy(lmd->lmd_mgssec, ptr, length); + lmd->lmd_mgssec[length] = '\0'; + return 0; +} + +/** Parse mount line options + * e.g. mount -v -t lustre -o abort_recov uml1:uml2:/lustre-client /mnt/lustre + * dev is passed as device=uml1:/lustre by mount.lustre + */ static int lmd_parse(char *options, struct lustre_mount_data *lmd) { char *s1, *s2, *devname = NULL; @@ -1827,6 +2152,8 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd) s1 = options; while (*s1) { int clear = 0; + int time_min = OBD_RECOVERY_TIME_MIN; + /* Skip whitespace and extra commas */ while (*s1 == ' ' || *s1 == ',') s1++; @@ -1839,12 +2166,31 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd) if (strncmp(s1, "abort_recov", 11) == 0) { lmd->lmd_flags |= LMD_FLG_ABORT_RECOV; clear++; + } else if (strncmp(s1, "recovery_time_soft=", 19) == 0) { + lmd->lmd_recovery_time_soft = max_t(int, + simple_strtoul(s1 + 19, NULL, 10), time_min); + clear++; + } else if (strncmp(s1, "recovery_time_hard=", 19) == 0) { + lmd->lmd_recovery_time_hard = max_t(int, + simple_strtoul(s1 + 19, NULL, 10), time_min); + clear++; + } else if (strncmp(s1, "noir", 4) == 0) { + lmd->lmd_flags |= LMD_FLG_NOIR; /* test purpose only. */ + clear++; } else if (strncmp(s1, "nosvc", 5) == 0) { lmd->lmd_flags |= LMD_FLG_NOSVC; clear++; } else if (strncmp(s1, "nomgs", 5) == 0) { lmd->lmd_flags |= LMD_FLG_NOMGS; clear++; + } else if (strncmp(s1, "writeconf", 9) == 0) { + lmd->lmd_flags |= LMD_FLG_WRITECONF; + clear++; + } else if (strncmp(s1, "mgssec=", 7) == 0) { + rc = lmd_parse_mgssec(lmd, s1 + 7); + if (rc) + goto invalid; + clear++; /* ost exclusion list */ } else if (strncmp(s1, "exclude=", 8) == 0) { rc = lmd_make_exclusion(lmd, s1 + 7); @@ -1885,7 +2231,7 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd) s1 = strstr(devname, ":/"); if (s1) { ++s1; - lmd->lmd_flags = LMD_FLG_CLIENT; + lmd->lmd_flags |= LMD_FLG_CLIENT; /* Remove leading /s from fsname */ while (*++s1 == '/') ; /* Freed in lustre_free_lsi */ @@ -1913,6 +2259,7 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd) strcpy(lmd->lmd_opts, options); } + lmd_print(lmd); lmd->lmd_magic = LMD_MAGIC; RETURN(rc); @@ -1922,11 +2269,20 @@ invalid: RETURN(-EINVAL); } +struct lustre_mount_data2 { + void *lmd2_data; + struct vfsmount *lmd2_mnt; +}; -/* Common mount */ +/** This is the entry point for the mount call into Lustre. + * This is called when a server or client is mounted, + * and this is where we start setting things up. + * @param data Mount options (e.g. -o flock,abort_recov) + */ int lustre_fill_super(struct super_block *sb, void *data, int silent) { struct lustre_mount_data *lmd; + struct lustre_mount_data2 *lmd2 = data; struct lustre_sb_info *lsi; int rc; ENTRY; @@ -1942,10 +2298,15 @@ int lustre_fill_super(struct super_block *sb, void *data, int silent) * Disable lockdep during mount, because mount locking patterns are * `special'. */ - lockdep_off(); + cfs_lockdep_off(); + + /* + * LU-639: the obd cleanup of last mount may not finish yet, wait here. + */ + obd_zombie_barrier(); /* Figure out the lmd from the mount options */ - if (lmd_parse((char *)data, lmd)) { + if (lmd_parse((char *)(lmd2->lmd2_data), lmd)) { lustre_put_lsi(sb); GOTO(out, rc = -EINVAL); } @@ -1966,7 +2327,7 @@ int lustre_fill_super(struct super_block *sb, void *data, int silent) } /* Connect and start */ /* (should always be ll_fill_super) */ - rc = (*client_fill_super)(sb); + rc = (*client_fill_super)(sb, lmd2->lmd2_mnt); /* c_f_s will call lustre_common_put_super on failure */ } } else { @@ -1990,14 +2351,15 @@ out: CDEBUG(D_SUPER, "Mount %s complete\n", lmd->lmd_dev); } - lockdep_on(); + cfs_lockdep_on(); return rc; } /* We can't call ll_fill_super by name because it lives in a module that must be loaded after this one. */ -void lustre_register_client_fill_super(int (*cfs)(struct super_block *sb)) +void lustre_register_client_fill_super(int (*cfs)(struct super_block *sb, + struct vfsmount *mnt)) { client_fill_super = cfs; } @@ -2010,17 +2372,18 @@ void lustre_register_kill_super_cb(void (*cfs)(struct super_block *sb)) /***************** FS registration ******************/ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)) -struct super_block * lustre_get_sb(struct file_system_type *fs_type, - int flags, const char *devname, void * data) +struct super_block * lustre_get_sb(struct file_system_type *fs_type, int flags, + const char *devname, void * data) { return get_sb_nodev(fs_type, flags, data, lustre_fill_super); } #else -int lustre_get_sb(struct file_system_type *fs_type, - int flags, const char *devname, void * data, - struct vfsmount *mnt) +int lustre_get_sb(struct file_system_type *fs_type, int flags, + const char *devname, void * data, struct vfsmount *mnt) { - return get_sb_nodev(fs_type, flags, data, lustre_fill_super, mnt); + struct lustre_mount_data2 lmd2 = {data, mnt}; + + return get_sb_nodev(fs_type, flags, &lmd2, lustre_fill_super, mnt); } #endif @@ -2034,12 +2397,17 @@ void lustre_kill_super(struct super_block *sb) kill_anon_super(sb); } +/** Register the "lustre" fs type + */ struct file_system_type lustre_fs_type = { .owner = THIS_MODULE, .name = "lustre", .get_sb = lustre_get_sb, .kill_sb = lustre_kill_super, .fs_flags = FS_BINARY_MOUNTDATA | FS_REQUIRES_DEV | +#ifdef FS_HAS_FIEMAP + FS_HAS_FIEMAP | +#endif LL_RENAME_DOES_D_MOVE, };