X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fobdclass%2Fobd_mount.c;h=9cef3236a0d8e24c26147d372f3c73e8d4485414;hb=10cf5e4ec079fed1fa339240e00c027232f7971e;hp=8ed47c93dfcf94fc94a3d4463eddf4068dcfdf80;hpb=7c3a4c77c23a7d8b065d530b86a2f141579acf1c;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c index 8ed47c9..1c99179 100644 --- a/lustre/obdclass/obd_mount.c +++ b/lustre/obdclass/obd_mount.c @@ -1,33 +1,49 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: +/* + * GPL HEADER START + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * lustre/obdclass/obd_mount.c - * Client/server mount routines + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf * - * Copyright (c) 2006 Cluster File Systems, Inc. - * Author: Nathan Rutman + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. * - * This file is part of Lustre, http://www.lustre.org/ + * GPL HEADER END + */ +/* + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * Copyright (c) 2011, 2012, Intel Corporation. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * lustre/obdclass/obd_mount.c * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Client mount routines * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Author: Nathan Rutman */ #define DEBUG_SUBSYSTEM S_CLASS -#define D_MOUNT D_SUPER|D_CONFIG /*|D_WARNING */ +#define D_MOUNT (D_SUPER|D_CONFIG/*|D_WARNING */) #define PRINT_CMD CDEBUG -#define PRINT_MASK D_SUPER|D_CONFIG #include #include @@ -39,336 +55,30 @@ #include #include -static int (*client_fill_super)(struct super_block *sb) = NULL; -static void (*kill_super_cb)(struct super_block *sb) = NULL; - -/*********** mount lookup *********/ - -DECLARE_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; - 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); - if (strcmp(name, lmi->lmi_name) == 0) - RETURN(lmi); - } - RETURN(NULL); -} - -/* we must register an obd for a mount before we call the setup routine. - *_setup will call lustre_get_mount to get the mnt struct - by obd_name, since we can't pass the pointer to setup. */ -static int server_register_mount(const char *name, struct super_block *sb, - struct vfsmount *mnt) -{ - struct lustre_mount_info *lmi; - char *name_cp; - ENTRY; - - LASSERT(mnt); - LASSERT(sb); - - OBD_ALLOC(lmi, sizeof(*lmi)); - if (!lmi) - RETURN(-ENOMEM); - OBD_ALLOC(name_cp, strlen(name) + 1); - if (!name_cp) { - OBD_FREE(lmi, sizeof(*lmi)); - RETURN(-ENOMEM); - } - strcpy(name_cp, name); - - down(&lustre_mount_info_lock); - - if (server_find_mount(name)) { - up(&lustre_mount_info_lock); - OBD_FREE(lmi, sizeof(*lmi)); - OBD_FREE(name_cp, strlen(name) + 1); - CERROR("Already registered %s\n", name); - RETURN(-EEXIST); - } - lmi->lmi_name = name_cp; - lmi->lmi_sb = sb; - lmi->lmi_mnt = mnt; - list_add(&lmi->lmi_list_chain, &server_mount_info_list); - - up(&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)); - - RETURN(0); -} - -/* when an obd no longer needs a mount */ -static int server_deregister_mount(const char *name) -{ - struct lustre_mount_info *lmi; - ENTRY; - - down(&lustre_mount_info_lock); - lmi = server_find_mount(name); - if (!lmi) { - up(&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)); - - OBD_FREE(lmi->lmi_name, strlen(lmi->lmi_name) + 1); - list_del(&lmi->lmi_list_chain); - OBD_FREE(lmi, sizeof(*lmi)); - up(&lustre_mount_info_lock); - - RETURN(0); -} - -/* obd's look up a registered mount using their obdname. This is just - for initial obd setup to find the mount struct. It should not be - called every time you want to mntget. */ -struct lustre_mount_info *server_get_mount(const char *name) -{ - struct lustre_mount_info *lmi; - struct lustre_sb_info *lsi; - ENTRY; - - down(&lustre_mount_info_lock); - lmi = server_find_mount(name); - up(&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); - - 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)); - - RETURN(lmi); -} - -/* - * Used by mdt to get mount_info from obdname. - * There are no blocking when using the mount_info. - * Do not use server_get_mount for this purpose. - */ -struct lustre_mount_info *server_get_mount_2(const char *name) -{ - struct lustre_mount_info *lmi; - ENTRY; - - down(&lustre_mount_info_lock); - lmi = server_find_mount(name); - up(&lustre_mount_info_lock); - if (!lmi) - CERROR("Can't find mount for %s\n", name); - - RETURN(lmi); -} - -static void unlock_mntput(struct vfsmount *mnt) -{ - if (kernel_locked()) { - unlock_kernel(); - mntput(mnt); - lock_kernel(); - } else { - mntput(mnt); - } -} - -static int lustre_put_lsi(struct super_block *sb); - -/* to be called from obd_cleanup methods */ -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; - ENTRY; - - /* This might be the last one, can't deref after this */ - unlock_mntput(mnt); - - down(&lustre_mount_info_lock); - lmi = server_find_mount(name); - up(&lustre_mount_info_lock); - if (!lmi) { - CERROR("Can't find mount for %s\n", name); - RETURN(-ENOENT); - } - lsi = s2lsi(lmi->lmi_sb); - 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); - - if (lustre_put_lsi(lmi->lmi_sb)) { - CDEBUG(D_MOUNT, "Last put of mnt %p from %s, vfscount=%d\n", - lmi->lmi_mnt, name, count); - /* last mount is the One True Mount */ - if (count > 1) - CERROR("%s: mount busy, vfscount=%d!\n", name, count); - } - - /* this obd should never need the mount again */ - server_deregister_mount(name); - - RETURN(0); -} - -/* Corresponding to server_get_mount_2 */ -int server_put_mount_2(const char *name, struct vfsmount *mnt) -{ - ENTRY; - RETURN(0); -} - -/******* mount helper utilities *********/ - -#if 0 -static void ldd_print(struct lustre_disk_data *ldd) -{ - PRINT_CMD(PRINT_MASK, " disk data:\n"); - PRINT_CMD(PRINT_MASK, "server: %s\n", ldd->ldd_svname); - PRINT_CMD(PRINT_MASK, "uuid: %s\n", (char *)ldd->ldd_uuid); - PRINT_CMD(PRINT_MASK, "fs: %s\n", ldd->ldd_fsname); - PRINT_CMD(PRINT_MASK, "index: %04x\n", ldd->ldd_svindex); - PRINT_CMD(PRINT_MASK, "config: %d\n", ldd->ldd_config_ver); - PRINT_CMD(PRINT_MASK, "flags: %#x\n", ldd->ldd_flags); - PRINT_CMD(PRINT_MASK, "diskfs: %s\n", MT_STR(ldd)); - PRINT_CMD(PRINT_MASK, "options: %s\n", ldd->ldd_mount_opts); - PRINT_CMD(PRINT_MASK, "params: %s\n", ldd->ldd_params); - PRINT_CMD(PRINT_MASK, "comment: %s\n", ldd->ldd_userdata); -} -#endif - -static int ldd_parse(struct lvfs_run_ctxt *mount_ctxt, - struct lustre_disk_data *ldd) -{ - struct lvfs_run_ctxt saved; - struct file *file; - loff_t off = 0; - unsigned long len; - int rc; - ENTRY; - - push_ctxt(&saved, mount_ctxt, NULL); - - file = filp_open(MOUNT_DATA_FILE, O_RDONLY, 0644); - if (IS_ERR(file)) { - rc = PTR_ERR(file); - CERROR("cannot open %s: rc = %d\n", MOUNT_DATA_FILE, rc); - GOTO(out, rc); - } - - 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)); - GOTO(out_close, rc = -EINVAL); - } - - rc = lustre_fread(file, ldd, len, &off); - if (rc != len) { - CERROR("error reading %s: read %d of %lu\n", - MOUNT_DATA_FILE, rc, len); - GOTO(out_close, rc = -EINVAL); - } - rc = 0; - - if (ldd->ldd_magic != LDD_MAGIC) { - /* FIXME add swabbing support */ - CERROR("Bad magic in %s: %x!=%x\n", MOUNT_DATA_FILE, - ldd->ldd_magic, LDD_MAGIC); - GOTO(out_close, rc = -EINVAL); - } - - if (ldd->ldd_feature_incompat & ~LDD_INCOMPAT_SUPP) { - CERROR("%s: unsupported incompat filesystem feature(s) %x\n", - ldd->ldd_svname, - ldd->ldd_feature_incompat & ~LDD_INCOMPAT_SUPP); - GOTO(out_close, rc = -EINVAL); - } - if (ldd->ldd_feature_rocompat & ~LDD_ROCOMPAT_SUPP) { - CERROR("%s: unsupported read-only filesystem feature(s) %x\n", - ldd->ldd_svname, - ldd->ldd_feature_rocompat & ~LDD_ROCOMPAT_SUPP); - /* Do something like remount filesystem read-only */ - GOTO(out_close, rc = -EINVAL); - } - -out_close: - filp_close(file, 0); -out: - pop_ctxt(&saved, mount_ctxt, NULL); - RETURN(rc); -} - -static int ldd_write(struct lvfs_run_ctxt *mount_ctxt, - struct lustre_disk_data *ldd) -{ - struct lvfs_run_ctxt saved; - struct file *file; - loff_t off = 0; - unsigned long len = sizeof(struct lustre_disk_data); - int rc = 0; - ENTRY; - - LASSERT(ldd->ldd_magic == LDD_MAGIC); - - ldd->ldd_config_ver++; - - push_ctxt(&saved, mount_ctxt, NULL); - - file = filp_open(MOUNT_DATA_FILE, O_RDWR, 0644); - if (IS_ERR(file)) { - rc = PTR_ERR(file); - CERROR("cannot open %s: rc = %d\n", MOUNT_DATA_FILE, rc); - GOTO(out, rc); - } - - rc = lustre_fwrite(file, ldd, len, &off); - if (rc != len) { - CERROR("error writing %s: read %d of %lu\n", - MOUNT_DATA_FILE, rc, len); - GOTO(out_close, rc = -EINVAL); - } - - rc = 0; - -out_close: - filp_close(file, 0); -out: - pop_ctxt(&saved, mount_ctxt, NULL); - RETURN(rc); -} +static int (*client_fill_super)(struct super_block *sb, + struct vfsmount *mnt); +static void (*kill_super_cb)(struct super_block *sb); /**************** 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; @@ -377,15 +87,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 " @@ -399,12 +115,13 @@ int lustre_process_log(struct super_block *sb, char *logname, "communication errors between this node and " "the MGS, a bad configuration, or other " "errors. See the syslog for more " - "information.\n", mgc->obd_name, logname, + "information.\n", mgc->obd_name, logname, rc); /* class_obd_list(); */ RETURN(rc); } +EXPORT_SYMBOL(lustre_process_log); /* Stop watching this config log for updates */ int lustre_end_log(struct super_block *sb, char *logname, @@ -430,9 +147,13 @@ int lustre_end_log(struct super_block *sb, char *logname, lustre_cfg_free(lcfg); RETURN(rc); } +EXPORT_SYMBOL(lustre_end_log); /**************** 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) { @@ -459,98 +180,48 @@ int do_lcfg(char *cfgname, lnet_nid_t nid, int cmd, lustre_cfg_free(lcfg); return(rc); } +EXPORT_SYMBOL(do_lcfg); -static int lustre_start_simple(char *obdname, char *type, char *uuid, - char *s1, char *s2) -{ - int rc; - CDEBUG(D_MOUNT, "Starting obd %s (typ=%s)\n", obdname, type); - - rc = do_lcfg(obdname, 0, LCFG_ATTACH, type, uuid, 0, 0); - if (rc) { - CERROR("%s attach error %d\n", obdname, rc); - return(rc); - } - rc = do_lcfg(obdname, 0, LCFG_SETUP, s1, s2, 0, 0); - if (rc) { - CERROR("%s setup error %d\n", obdname, rc); - do_lcfg(obdname, 0, LCFG_DETACH, 0, 0, 0, 0); - } - return rc; -} - -/* Set up a MGS to serve startup logs */ -static int server_start_mgs(struct super_block *sb) -{ - struct lustre_sb_info *lsi = s2lsi(sb); - struct vfsmount *mnt = lsi->lsi_srv_mnt; - struct lustre_mount_info *lmi; - int rc = 0; - ENTRY; - LASSERT(mnt); - - /* It is impossible to have more than 1 MGS per node, since - MGC wouldn't know which to connect to */ - lmi = server_find_mount(LUSTRE_MGS_OBDNAME); - if (lmi) { - lsi = s2lsi(lmi->lmi_sb); - LCONSOLE_ERROR_MSG(0x15d, "The MGS service was already started" - " from server %s\n", - lsi->lsi_ldd->ldd_svname); - RETURN(-EALREADY); - } - - CDEBUG(D_CONFIG, "Start MGS service %s\n", LUSTRE_MGS_OBDNAME); - - 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) - LCONSOLE_ERROR_MSG(0x15e, "Failed to start MGS '%s' (%d). " - "Is the 'mgs' module loaded?\n", - LUSTRE_MGS_OBDNAME, rc); - RETURN(rc); -} - -static int server_stop_mgs(struct super_block *sb) +/** Call class_attach and class_setup. These methods in turn call + * obd type-specific methods. + */ +int lustre_start_simple(char *obdname, char *type, char *uuid, + char *s1, char *s2, char *s3, char *s4) { - struct obd_device *obd; - int rc; - ENTRY; - - CDEBUG(D_MOUNT, "Stop MGS service %s\n", LUSTRE_MGS_OBDNAME); - - /* There better be only one MGS */ - obd = class_name2obd(LUSTRE_MGS_OBDNAME); - if (!obd) { - CDEBUG(D_CONFIG, "mgs %s not running\n", LUSTRE_MGS_OBDNAME); - RETURN(-EALREADY); - } - - /* The MGS should always stop when we say so */ - obd->obd_force = 1; - rc = class_manual_cleanup(obd); - RETURN(rc); + int rc; + CDEBUG(D_MOUNT, "Starting obd %s (typ=%s)\n", obdname, type); + + rc = do_lcfg(obdname, 0, LCFG_ATTACH, type, uuid, 0, 0); + if (rc) { + CERROR("%s attach error %d\n", obdname, rc); + return rc; + } + rc = do_lcfg(obdname, 0, LCFG_SETUP, s1, s2, s3, s4); + if (rc) { + CERROR("%s setup error %d\n", obdname, rc); + do_lcfg(obdname, 0, LCFG_DETACH, 0, 0, 0, 0); + } + return rc; } -DECLARE_MUTEX(mgc_start_lock); +DEFINE_MUTEX(mgc_start_lock); -/* Set up a mgcobd to process startup logs */ -static int lustre_start_mgc(struct super_block *sb) +/** Set up a mgc obd to process startup logs + * + * \param sb [in] super block of the mgc obd + * + * \retval 0 success, otherwise error code + */ +int lustre_start_mgc(struct super_block *sb) { - struct lustre_handle mgc_conn = {0, }; - struct obd_connect_data ocd = { 0 }; + struct obd_connect_data *data = NULL; struct lustre_sb_info *lsi = s2lsi(sb); struct obd_device *obd; struct obd_export *exp; 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; @@ -559,13 +230,13 @@ static int lustre_start_mgc(struct super_block *sb) LASSERT(lsi->lsi_lmd); /* Find the first non-lo MGS nid for our MGC name */ - if (lsi->lsi_flags & LSI_SERVER) { - ptr = lsi->lsi_ldd->ldd_params; - /* Use mgsnode= nids */ - if ((class_find_param(ptr, PARAM_MGSNODE, &ptr) == 0) && - (class_parse_nid(ptr, &nid, &ptr) == 0)) { - i++; - } else if (IS_MGS(lsi->lsi_ldd)) { + if (IS_SERVER(lsi)) { + /* mount -o mgsnode=nid */ + ptr = lsi->lsi_lmd->lmd_mgs; + if (lsi->lsi_lmd->lmd_mgs && + (class_parse_nid(lsi->lsi_lmd->lmd_mgs, &nid, &ptr) == 0)) { + i++; + } else if (IS_MGS(lsi)) { lnet_process_id_t id; while ((rc = LNetGetId(i++, &id)) != -ENOENT) { if (LNET_NETTYP(LNET_NIDNET(id.nid)) == LOLND) @@ -586,6 +257,8 @@ static int lustre_start_mgc(struct super_block *sb) RETURN(-EINVAL); } + mutex_lock(&mgc_start_lock); + len = strlen(LUSTRE_MGC_OBDNAME) + strlen(libcfs_nid2str(nid)) + 1; OBD_ALLOC(mgcname, len); OBD_ALLOC(niduuid, len + 2); @@ -593,17 +266,53 @@ 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) { + if (obd && !obd->obd_stopping) { + rc = obd_set_info_async(NULL, 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(NULL, 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 old connection, or registration will fail. */ - if ((lsi->lsi_flags & LSI_SERVER) && IS_MGS(lsi->lsi_ldd)) { + if (IS_MGS(lsi)) { CDEBUG(D_MOUNT, "New MGS with live MGC\n"); recov_bk = 1; } @@ -614,8 +323,8 @@ static int lustre_start_mgc(struct super_block *sb) if at all possible. */ recov_bk++; CDEBUG(D_MOUNT, "%s: Set MGC reconnect %d\n", mgcname,recov_bk); - rc = obd_set_info_async(obd->obd_self_export, - strlen(KEY_INIT_RECOV_BACKUP), + rc = obd_set_info_async(NULL, obd->obd_self_export, + sizeof(KEY_INIT_RECOV_BACKUP), KEY_INIT_RECOV_BACKUP, sizeof(recov_bk), &recov_bk, NULL); GOTO(out, rc = 0); @@ -626,9 +335,9 @@ static int lustre_start_mgc(struct super_block *sb) /* Add the primary nids for the MGS */ i = 0; sprintf(niduuid, "%s_%x", mgcname, i); - if (lsi->lsi_flags & LSI_SERVER) { - ptr = lsi->lsi_ldd->ldd_params; - if (IS_MGS(lsi->lsi_ldd)) { + if (IS_SERVER(lsi)) { + ptr = lsi->lsi_lmd->lmd_mgs; + if (IS_MGS(lsi)) { /* Use local nids (including LO) */ lnet_process_id_t id; while ((rc = LNetGetId(i++, &id)) != -ENOENT) { @@ -637,7 +346,11 @@ static int lustre_start_mgc(struct super_block *sb) } } else { /* Use mgsnode= nids */ - if (class_find_param(ptr, PARAM_MGSNODE, &ptr) != 0) { + /* mount -o mgsnode=nid */ + if (lsi->lsi_lmd->lmd_mgs) { + ptr = lsi->lsi_lmd->lmd_mgs; + } else if (class_find_param(ptr, PARAM_MGSNODE, + &ptr) != 0) { CERROR("No MGS nids given.\n"); GOTO(out_free, rc = -EINVAL); } @@ -672,20 +385,20 @@ static int lustre_start_mgc(struct super_block *sb) /* Start the MGC */ rc = lustre_start_simple(mgcname, LUSTRE_MGC_NAME, - (char *)uuid->uuid, LUSTRE_MGS_OBDNAME, - niduuid); + (char *)uuid->uuid, LUSTRE_MGS_OBDNAME, + niduuid, 0, 0); OBD_FREE_PTR(uuid); if (rc) GOTO(out_free, rc); /* Add any failover MGS nids */ i = 1; - while ((*ptr == ':' || - class_find_param(ptr, PARAM_MGSNODE, &ptr) == 0)) { + while (ptr && ((*ptr == ':' || + class_find_param(ptr, PARAM_MGSNODE, &ptr) == 0))) { /* New failover node */ sprintf(niduuid, "%s_%x", mgcname, i); j = 0; - while (class_parse_nid(ptr, &nid, &ptr) == 0) { + while (class_parse_nid_quiet(ptr, &nid, &ptr) == 0) { j++; rc = do_lcfg(mgcname, nid, LCFG_ADD_UUID, niduuid, 0,0,0); @@ -709,31 +422,47 @@ static int lustre_start_mgc(struct super_block *sb) GOTO(out_free, rc = -ENOTCONN); } + rc = obd_set_info_async(NULL, 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; - rc = obd_set_info_async(obd->obd_self_export, - strlen(KEY_INIT_RECOV_BACKUP), + rc = obd_set_info_async(NULL, obd->obd_self_export, + sizeof(KEY_INIT_RECOV_BACKUP), KEY_INIT_RECOV_BACKUP, sizeof(recov_bk), &recov_bk, NULL); if (rc) /* 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 */ - ocd.ocd_connect_flags = OBD_CONNECT_VERSION | OBD_CONNECT_FID; - ocd.ocd_version = LUSTRE_VERSION_CODE; + /* We connect to the MGS at setup, and don't disconnect until cleanup */ + data->ocd_connect_flags = OBD_CONNECT_VERSION | OBD_CONNECT_AT | + OBD_CONNECT_FULL20 | OBD_CONNECT_IMP_RECOV | + OBD_CONNECT_LVB_TYPE; - rc = obd_connect(NULL, &mgc_conn, obd, &(obd->obd_uuid), &ocd, NULL); +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 2, 50, 0) + data->ocd_connect_flags |= OBD_CONNECT_MNE_SWAB; +#else +#warning "LU-1644: Remove old OBD_CONNECT_MNE_SWAB fixup and imp_need_mne_swab" +#endif + + 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, &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: @@ -741,8 +470,10 @@ out: to the same mgc.*/ lsi->lsi_mgc = obd; out_free: - mutex_up(&mgc_start_lock); + mutex_unlock(&mgc_start_lock); + if (data) + OBD_FREE_PTR(data); if (mgcname) OBD_FREE(mgcname, len); if (niduuid) @@ -765,16 +496,17 @@ static int lustre_stop_mgc(struct super_block *sb) RETURN(-ENOENT); lsi->lsi_mgc = NULL; - mutex_down(&mgc_start_lock); - if (!atomic_dec_and_test(&obd->u.cli.cl_mgc_refcount)) { + 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); } - /* The MGC has no recoverable data in any case. + /* The MGC has no recoverable data in any case. * force shotdown set in umount_begin */ obd->obd_no_recov = 1; @@ -801,7 +533,8 @@ static int lustre_stop_mgc(struct super_block *sb) /* Clean the nid uuids */ if (!niduuid) - RETURN(-ENOMEM); + GOTO(out, rc = -ENOMEM); + for (i = 0; i < lsi->lsi_lmd->lmd_mgs_failnodes; i++) { sprintf(ptr, "_%x", i); rc = do_lcfg(LUSTRE_MGC_OBDNAME, 0, LCFG_DEL_UUID, @@ -810,328 +543,12 @@ static int lustre_stop_mgc(struct super_block *sb) CERROR("del MDC UUID %s failed: rc = %d\n", niduuid, rc); } - OBD_FREE(niduuid, len); - /* class_import_put will get rid of the additional connections */ - out: - mutex_up(&mgc_start_lock); - RETURN(rc); -} - -/* Since there's only one mgc per node, we have to change it's fs to get - access to the right disk. */ -static int server_mgc_set_fs(struct obd_device *mgc, struct super_block *sb) -{ - struct lustre_sb_info *lsi = s2lsi(sb); - int rc; - ENTRY; - - CDEBUG(D_MOUNT, "Set mgc disk for %s\n", lsi->lsi_lmd->lmd_dev); - - /* cl_mgc_sem in mgc insures we sleep if the mgc_fs is busy */ - rc = obd_set_info_async(mgc->obd_self_export, - strlen("set_fs"), "set_fs", - sizeof(*sb), sb, NULL); - if (rc) { - CERROR("can't set_fs %d\n", rc); - } - - RETURN(rc); -} - -static int server_mgc_clear_fs(struct obd_device *mgc) -{ - int rc; - ENTRY; - - CDEBUG(D_MOUNT, "Unassign mgc disk\n"); - - rc = obd_set_info_async(mgc->obd_self_export, - strlen("clear_fs"), "clear_fs", - 0, NULL, NULL); - RETURN(rc); -} - -DECLARE_MUTEX(server_start_lock); - -/* Stop MDS/OSS if nobody is using them */ -static int server_stop_servers(int lddflags, int lsiflags) -{ - struct obd_device *obd = NULL; - struct obd_type *type = NULL; - int rc = 0; - ENTRY; - - mutex_down(&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 */ - if ((lddflags & LDD_F_SV_TYPE_MDT) && - (obd = class_name2obd(LUSTRE_MDS_OBDNAME))) { - /*FIXME pre-rename, should eventually be LUSTRE_MDT_NAME*/ - type = class_search_type(LUSTRE_MDS_NAME); - } - /* if this was an OST, and there are no more OST's, clean up the OSS */ - if ((lddflags & LDD_F_SV_TYPE_OST) && - (obd = class_name2obd(LUSTRE_OSS_OBDNAME))) { - type = class_search_type(LUSTRE_OST_NAME); - } - - if (obd && (!type || !type->typ_refcnt)) { - int err; - obd->obd_force = 1; - /* obd_fail doesn't mean much on a server obd */ - err = class_manual_cleanup(obd); - if (!rc) - rc = err; - } - - mutex_up(&server_start_lock); - - RETURN(rc); -} - -int server_mti_print(char *title, struct mgs_target_info *mti) -{ - PRINT_CMD(PRINT_MASK, "mti %s\n", title); - PRINT_CMD(PRINT_MASK, "server: %s\n", mti->mti_svname); - PRINT_CMD(PRINT_MASK, "fs: %s\n", mti->mti_fsname); - PRINT_CMD(PRINT_MASK, "uuid: %s\n", mti->mti_uuid); - PRINT_CMD(PRINT_MASK, "ver: %d flags: %#x\n", - mti->mti_config_ver, mti->mti_flags); - return(0); -} - -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; - ENTRY; - - if (!(lsi->lsi_flags & LSI_SERVER)) - RETURN(-EINVAL); - - strncpy(mti->mti_fsname, ldd->ldd_fsname, - sizeof(mti->mti_fsname)); - strncpy(mti->mti_svname, ldd->ldd_svname, - sizeof(mti->mti_svname)); - - mti->mti_nid_count = 0; - while (LNetGetId(i++, &id) != -ENOENT) { - if (LNET_NETTYP(LNET_NIDNET(id.nid)) == LOLND) - continue; - mti->mti_nids[mti->mti_nid_count] = id.nid; - mti->mti_nid_count++; - if (mti->mti_nid_count >= MTI_NIDS_MAX) { - CWARN("Only using first %d nids for %s\n", - mti->mti_nid_count, mti->mti_svname); - break; - } - } - - mti->mti_lustre_ver = LUSTRE_VERSION_CODE; - mti->mti_config_ver = 0; - mti->mti_flags = ldd->ldd_flags; - mti->mti_stripe_index = ldd->ldd_svindex; - memcpy(mti->mti_uuid, ldd->ldd_uuid, sizeof(mti->mti_uuid)); - if (strlen(ldd->ldd_params) > sizeof(mti->mti_params)) { - CERROR("params too big for mti\n"); - RETURN(-ENOMEM); - } - memcpy(mti->mti_params, ldd->ldd_params, sizeof(mti->mti_params)); - RETURN(0); -} - -/* Register an old or new target with the MGS. If needed MGS will construct - startup logs and assign index */ -int server_register_target(struct super_block *sb) -{ - struct lustre_sb_info *lsi = s2lsi(sb); - struct obd_device *mgc = lsi->lsi_mgc; - struct lustre_disk_data *ldd = lsi->lsi_ldd; - 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); - - CDEBUG(D_MOUNT, "Registration %s, fs=%s, %s, index=%04x, flags=%#x\n", - mti->mti_svname, mti->mti_fsname, - libcfs_nid2str(mti->mti_nids[0]), mti->mti_stripe_index, - mti->mti_flags); - - /* Register the target */ - /* FIXME use mgc_process_config instead */ - rc = obd_set_info_async(mgc->u.cli.cl_mgc_mgsexp, - strlen("register_target"), "register_target", - sizeof(*mti), mti, NULL); - if (rc) - GOTO(out, rc); - - /* Always update our flags */ - ldd->ldd_flags = mti->mti_flags & ~LDD_F_REWRITE_LDD; - - /* If this flag is set, it means the MGS wants us to change our - on-disk data. (So far this means just the index.) */ - if (mti->mti_flags & LDD_F_REWRITE_LDD) { - char *label; - int err; - CDEBUG(D_MOUNT, "Changing on-disk index from %#x to %#x " - "for %s\n", ldd->ldd_svindex, mti->mti_stripe_index, - mti->mti_svname); - ldd->ldd_svindex = mti->mti_stripe_index; - strncpy(ldd->ldd_svname, mti->mti_svname, - sizeof(ldd->ldd_svname)); - /* or ldd_make_sv_name(ldd); */ - ldd_write(&mgc->obd_lvfs_ctxt, ldd); - err = fsfilt_set_label(mgc, lsi->lsi_srv_mnt->mnt_sb, - mti->mti_svname); - if (err) - CERROR("Label set error %d\n", err); - label = fsfilt_get_label(mgc, lsi->lsi_srv_mnt->mnt_sb); - if (label) - CDEBUG(D_MOUNT, "Disk label changed to %s\n", label); - - /* Flush the new ldd to disk */ - fsfilt_sync(mgc, lsi->lsi_srv_mnt->mnt_sb); - } - -out: - if (mti) - OBD_FREE_PTR(mti); - RETURN(rc); -} - -/* Start targets */ -static int server_start_targets(struct super_block *sb, struct vfsmount *mnt) -{ - struct obd_device *obd; - struct lustre_sb_info *lsi = s2lsi(sb); - struct config_llog_instance cfg; - int rc; - ENTRY; - - CDEBUG(D_MOUNT, "starting target %s\n", lsi->lsi_ldd->ldd_svname); - -#if 0 - /* 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); - obd = class_name2obd(LUSTRE_MDS_OBDNAME); - if (!obd) { - rc = lustre_start_simple(LUSTRE_MDS_OBDNAME, - /* FIXME pre-rename, should eventually be LUSTRE_MDS_NAME */ - LUSTRE_MDT_NAME, - LUSTRE_MDS_OBDNAME"_uuid", - 0, 0); - if (rc) { - mutex_up(&server_start_lock); - CERROR("failed to start MDS: %d\n", rc); - RETURN(rc); - } - } - mutex_up(&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) { - /* make sure OSS is started */ - mutex_down(&server_start_lock); - obd = class_name2obd(LUSTRE_OSS_OBDNAME); - if (!obd) { - rc = lustre_start_simple(LUSTRE_OSS_OBDNAME, - LUSTRE_OSS_NAME, - LUSTRE_OSS_OBDNAME"_uuid", - 0, 0); - if (rc) { - mutex_up(&server_start_lock); - CERROR("failed to start OSS: %d\n", rc); - RETURN(rc); - } - } - mutex_up(&server_start_lock); - } - - /* Set the mgc fs to our server disk. This allows the MGC - to read and write configs locally. */ - 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); - - /* Let the target look up the mount using the target's name - (we can't pass the sb or mnt through class_process_config.) */ - rc = server_register_mount(lsi->lsi_ldd->ldd_svname, sb, mnt); - if (rc) - GOTO(out_mgc, rc); - - /* Start targets using the llog named for the target */ - memset(&cfg, 0, sizeof(cfg)); - rc = lustre_process_log(sb, lsi->lsi_ldd->ldd_svname, &cfg); - if (rc) { - CERROR("failed to start server %s: %d\n", - lsi->lsi_ldd->ldd_svname, rc); - GOTO(out_mgc, rc); - } - -out_mgc: - /* Release the mgc fs for others to use */ - server_mgc_clear_fs(lsi->lsi_mgc); - - if (!rc) { - obd = class_name2obd(lsi->lsi_ldd->ldd_svname); - if (!obd) { - CERROR("no server named %s was started\n", - lsi->lsi_ldd->ldd_svname); - RETURN(-ENXIO); - } - - if ((lsi->lsi_lmd->lmd_flags & LMD_FLG_ABORT_RECOV) && - (OBP(obd, iocontrol))) { - obd_iocontrol(OBD_IOC_ABORT_RECOVERY, - obd->obd_self_export, 0, NULL, NULL); - } - - /* log has been fully processed */ - obd_notify(obd, NULL, OBD_NOTIFY_CONFIG, (void *)CONFIG_LOG); - } + if (niduuid) + OBD_FREE(niduuid, len); + /* class_import_put will get rid of the additional connections */ + mutex_unlock(&mgc_start_lock); RETURN(rc); } @@ -1139,22 +556,24 @@ out_mgc: struct lustre_sb_info *lustre_init_lsi(struct super_block *sb) { - struct lustre_sb_info *lsi = NULL; + struct lustre_sb_info *lsi; ENTRY; - OBD_ALLOC(lsi, sizeof(*lsi)); + OBD_ALLOC_PTR(lsi); if (!lsi) RETURN(NULL); - OBD_ALLOC(lsi->lsi_lmd, sizeof(*lsi->lsi_lmd)); + OBD_ALLOC_PTR(lsi->lsi_lmd); if (!lsi->lsi_lmd) { - OBD_FREE(lsi, sizeof(*lsi)); + OBD_FREE_PTR(lsi); RETURN(NULL); } 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; @@ -1167,16 +586,11 @@ static int lustre_free_lsi(struct super_block *sb) struct lustre_sb_info *lsi = s2lsi(sb); ENTRY; - if (!lsi) - RETURN(0); - - CDEBUG(D_MOUNT, "Freeing lsi\n"); + LASSERT(lsi != NULL); + CDEBUG(D_MOUNT, "Freeing lsi %p\n", lsi); /* someone didn't call server_put_mount. */ - LASSERT(atomic_read(&lsi->lsi_mounts) == 0); - - if (lsi->lsi_ldd != NULL) - OBD_FREE(lsi->lsi_ldd, sizeof(*lsi->lsi_ldd)); + LASSERT(cfs_atomic_read(&lsi->lsi_mounts) == 0); if (lsi->lsi_lmd != NULL) { if (lsi->lsi_lmd->lmd_dev != NULL) @@ -1185,6 +599,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); @@ -1192,6 +609,15 @@ static int lustre_free_lsi(struct super_block *sb) OBD_FREE(lsi->lsi_lmd->lmd_exclude, sizeof(lsi->lsi_lmd->lmd_exclude[0]) * lsi->lsi_lmd->lmd_exclude_count); + if (lsi->lsi_lmd->lmd_mgs != NULL) + OBD_FREE(lsi->lsi_lmd->lmd_mgs, + strlen(lsi->lsi_lmd->lmd_mgs) + 1); + if (lsi->lsi_lmd->lmd_osd_type != NULL) + OBD_FREE(lsi->lsi_lmd->lmd_osd_type, + strlen(lsi->lsi_lmd->lmd_osd_type) + 1); + if (lsi->lsi_lmd->lmd_params != NULL) + OBD_FREE(lsi->lsi_lmd->lmd_params, 4096); + OBD_FREE(lsi->lsi_lmd, sizeof(*lsi->lsi_lmd)); } @@ -1204,441 +630,129 @@ static int lustre_free_lsi(struct super_block *sb) /* The lsi has one reference for every server that is using the disk - e.g. MDT, MGS, and potentially MGC */ -static int lustre_put_lsi(struct super_block *sb) +int lustre_put_lsi(struct super_block *sb) { struct lustre_sb_info *lsi = s2lsi(sb); ENTRY; - LASSERT(lsi); - - CDEBUG(D_MOUNT, "put %p %d\n", sb, atomic_read(&lsi->lsi_mounts)); + LASSERT(lsi != NULL); - 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)) { + if (IS_SERVER(lsi) && lsi->lsi_osd_exp) { + obd_disconnect(lsi->lsi_osd_exp); + /* wait till OSD is gone */ + obd_zombie_barrier(); + } lustre_free_lsi(sb); RETURN(1); } RETURN(0); } -/*************** server mount ******************/ - -/* Kernel mount using mount options in MOUNT_DATA_FILE */ -static struct vfsmount *server_kernel_mount(struct super_block *sb) -{ - struct lvfs_run_ctxt mount_ctxt; - struct lustre_sb_info *lsi = s2lsi(sb); - struct lustre_disk_data *ldd; - struct lustre_mount_data *lmd = lsi->lsi_lmd; - struct vfsmount *mnt; - char *options = NULL; - unsigned long page, s_flags; - struct page *__page; - int rc; - ENTRY; - - OBD_ALLOC(ldd, sizeof(*ldd)); - if (!ldd) - RETURN(ERR_PTR(-ENOMEM)); - - /* In the past, we have always used flags = 0. - Note ext3/ldiskfs can't be mounted ro. */ - s_flags = sb->s_flags; - - /* Pre-mount ldiskfs to read the MOUNT_DATA_FILE */ - CDEBUG(D_MOUNT, "Pre-mount ldiskfs %s\n", lmd->lmd_dev); - mnt = ll_kern_mount("ldiskfs", s_flags, lmd->lmd_dev, 0); - if (IS_ERR(mnt)) { - rc = PTR_ERR(mnt); - CERROR("premount %s:%#lx ldiskfs failed: %d " - "Is the ldiskfs module available?\n", - lmd->lmd_dev, s_flags, rc ); - GOTO(out_free, rc); - } - - OBD_SET_CTXT_MAGIC(&mount_ctxt); - mount_ctxt.pwdmnt = mnt; - mount_ctxt.pwd = mnt->mnt_root; - mount_ctxt.fs = get_ds(); - - rc = ldd_parse(&mount_ctxt, ldd); - unlock_mntput(mnt); - - if (rc) { - CERROR("premount parse options failed: rc = %d\n", rc); - GOTO(out_free, rc); - } - - /* Done with our pre-mount, now do the real mount. */ - - /* Glom up mount options */ - OBD_PAGE_ALLOC(__page, CFS_ALLOC_STD); - if (!__page) - GOTO(out_free, rc = -ENOMEM); - page = (unsigned long)cfs_page_address(__page); - - options = (char *)page; - memset(options, 0, CFS_PAGE_SIZE); - strncpy(options, ldd->ldd_mount_opts, CFS_PAGE_SIZE - 2); - - /* 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, ","); - strncat(options, lmd->lmd_opts, len); - } - - /* Special permanent mount flags */ - if (IS_OST(ldd)) - s_flags |= MS_NOATIME | MS_NODIRATIME; - - CDEBUG(D_MOUNT, "kern_mount: %s %s %s\n", - MT_STR(ldd), lmd->lmd_dev, options); - mnt = ll_kern_mount(MT_STR(ldd), s_flags, lmd->lmd_dev, - (void *)options); - OBD_PAGE_FREE(__page); - if (IS_ERR(mnt)) { - rc = PTR_ERR(mnt); - CERROR("ll_kern_mount failed: rc = %d\n", rc); - GOTO(out_free, rc); - } - - lsi->lsi_ldd = ldd; /* freed at lsi cleanup */ - CDEBUG(D_SUPER, "%s: mnt = %p\n", lmd->lmd_dev, mnt); - RETURN(mnt); - -out_free: - OBD_FREE(ldd, sizeof(*ldd)); - lsi->lsi_ldd = NULL; - RETURN(ERR_PTR(rc)); -} - -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)); - } -} - -static void server_put_super(struct super_block *sb) +/** Get the fsname ("lustre") from the server name ("lustre-OST003F"). + * @param [in] svname server name including type and index + * @param [out] fsname Buffer to copy filesystem name prefix into. + * Must have at least 'strlen(fsname) + 1' chars. + * @param [out] endptr if endptr isn't NULL it is set to end of fsname + * rc < 0 on error + */ +int server_name2fsname(const char *svname, char *fsname, const char **endptr) { - struct lustre_sb_info *lsi = s2lsi(sb); - struct obd_device *obd; - struct vfsmount *mnt = lsi->lsi_srv_mnt; - char *tmpname, *extraname = NULL; - int tmpname_sz; - int lddflags = lsi->lsi_ldd->ldd_flags; - int lsiflags = lsi->lsi_flags; - int rc; - ENTRY; - - LASSERT(lsiflags & LSI_SERVER); - - tmpname_sz = strlen(lsi->lsi_ldd->ldd_svname) + 1; - OBD_ALLOC(tmpname, tmpname_sz); - memcpy(tmpname, lsi->lsi_ldd->ldd_svname, tmpname_sz); - CDEBUG(D_MOUNT, "server put_super %s\n", tmpname); - - /* Stop the target */ - if (!(lsi->lsi_lmd->lmd_flags & LMD_FLG_NOSVC) && - (IS_MDT(lsi->lsi_ldd) || IS_OST(lsi->lsi_ldd))) { - struct lustre_profile *lprof = NULL; - - /* tell the mgc to drop the config log */ - lustre_end_log(sb, lsi->lsi_ldd->ldd_svname, NULL); - - /* COMPAT_146 - profile may get deleted in mgc_cleanup. - If there are any setup/cleanup errors, save the lov - name for safety cleanup later. */ - lprof = class_get_profile(lsi->lsi_ldd->ldd_svname); - if (lprof && lprof->lp_dt) { - OBD_ALLOC(extraname, strlen(lprof->lp_dt) + 1); - strcpy(extraname, lprof->lp_dt); - } - - obd = class_name2obd(lsi->lsi_ldd->ldd_svname); - if (obd) { - CDEBUG(D_MOUNT, "stopping %s\n", obd->obd_name); - if (lsi->lsi_flags & LSI_UMOUNT_FAILOVER) - obd->obd_fail = 1; - /* We can't seem to give an error return code - * to .put_super, so we better make sure we clean up! */ - obd->obd_force = 1; - class_manual_cleanup(obd); - } else { - CERROR("no obd %s\n", lsi->lsi_ldd->ldd_svname); - server_deregister_mount(lsi->lsi_ldd->ldd_svname); - } - } - - /* If they wanted the mgs to stop separately from the mdt, they - should have put it on a different device. */ - if (IS_MGS(lsi->lsi_ldd)) { - /* stop the mgc before the mgs so the connection gets cleaned - up */ - lustre_stop_mgc(sb); - /* if MDS start with --nomgs, don't stop MGS then */ - if (!(lsi->lsi_lmd->lmd_flags & LMD_FLG_NOMGS)) - server_stop_mgs(sb); - } - - /* Clean the mgc and sb */ - rc = lustre_common_put_super(sb); - /* FIXME how can I report a failure to umount? */ - - /* Wait for the targets to really clean up - can't exit (and let the - sb get destroyed) while the mount is still in use */ - server_wait_finished(mnt); - - /* drop the One True Mount */ - unlock_mntput(mnt); - - /* Stop the servers (MDS, OSS) if no longer needed. We must wait - until the target is really gone so that our type refcount check - is right. */ - server_stop_servers(lddflags, lsiflags); - - /* In case of startup or cleanup err, stop related obds */ - if (extraname) { - obd = class_name2obd(extraname); - if (obd) { - CWARN("Cleaning orphaned obd %s\n", extraname); - obd->obd_force = 1; - class_manual_cleanup(obd); - } - OBD_FREE(extraname, strlen(extraname) + 1); - } - - LCONSOLE_WARN("server umount %s complete\n", tmpname); - OBD_FREE(tmpname, tmpname_sz); - EXIT; + const char *dash = strrchr(svname, '-'); + if (!dash) { + dash = strrchr(svname, ':'); + if (!dash) + return -EINVAL; + } + + /* interpret -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 != ':'; dash--) + ; + if (dash == svname) + return -EINVAL; + } + + if (fsname != NULL) { + strncpy(fsname, svname, dash - svname); + fsname[dash - svname] = '\0'; + } + + if (endptr != NULL) + *endptr = dash; + + return 0; } +EXPORT_SYMBOL(server_name2fsname); -#ifdef HAVE_UMOUNTBEGIN_VFSMOUNT -static void server_umount_begin(struct vfsmount *vfsmnt, int flags) -{ - struct super_block *sb = vfsmnt->mnt_sb; -#else -static void server_umount_begin(struct super_block *sb) +/** + * Get service name (svname) from string + * rc < 0 on error + * if endptr isn't NULL it is set to end of fsname * + */ +int server_name2svname(const char *label, char *svname, const char **endptr, + size_t svsize) { -#endif - struct lustre_sb_info *lsi = s2lsi(sb); - ENTRY; - -#ifdef HAVE_UMOUNTBEGIN_VFSMOUNT - if (!(flags & MNT_FORCE)) { - EXIT; - return; - } -#endif + int rc; + const const char *dash; - CDEBUG(D_MOUNT, "umount -f\n"); - /* umount = failover - umount -f = force - no third way to do non-force, non-failover */ - lsi->lsi_flags &= ~LSI_UMOUNT_FAILOVER; - lsi->lsi_flags |= LSI_UMOUNT_FORCE; - EXIT; -} + /* We use server_name2fsname() just for parsing */ + rc = server_name2fsname(label, NULL, &dash); + if (rc != 0) + return rc; -#ifndef HAVE_STATFS_DENTRY_PARAM -static int server_statfs (struct super_block *sb, struct kstatfs *buf) -{ -#else -static int server_statfs (struct dentry *dentry, struct kstatfs *buf) -{ - struct super_block *sb = dentry->d_sb; -#endif - struct vfsmount *mnt = s2lsi(sb)->lsi_srv_mnt; - ENTRY; + if (*dash != '-') + return -1; - if (mnt && mnt->mnt_sb && mnt->mnt_sb->s_op->statfs) { -#ifdef HAVE_STATFS_DENTRY_PARAM - int rc = mnt->mnt_sb->s_op->statfs(mnt->mnt_root, buf); -#else - int rc = mnt->mnt_sb->s_op->statfs(mnt->mnt_sb, buf); -#endif - if (!rc) { - buf->f_type = sb->s_magic; - RETURN(0); - } - } + if (strlcpy(svname, dash + 1, svsize) >= svsize) + return -E2BIG; - /* just return 0 */ - buf->f_type = sb->s_magic; - buf->f_bsize = sb->s_blocksize; - buf->f_blocks = 1; - buf->f_bfree = 0; - buf->f_bavail = 0; - buf->f_files = 1; - buf->f_ffree = 0; - buf->f_namelen = NAME_MAX; - RETURN(0); + return 0; } +EXPORT_SYMBOL(server_name2svname); -static struct super_operations server_ops = -{ - .put_super = server_put_super, - .umount_begin = server_umount_begin, /* umount -f */ - .statfs = server_statfs, -}; - -#define log2(n) ffz(~(n)) -#define LUSTRE_SUPER_MAGIC 0x0BD00BD1 -static int server_fill_super_common(struct super_block *sb) +/* Get the index from the obd name. + rc = server type, or + rc < 0 on error + if endptr isn't NULL it is set to end of name */ +int server_name2index(const char *svname, __u32 *idx, const char **endptr) { - struct inode *root = 0; - ENTRY; + unsigned long index; + int rc; + const char *dash; - CDEBUG(D_MOUNT, "Server sb, dev=%d\n", (int)sb->s_dev); + /* We use server_name2fsname() just for parsing */ + rc = server_name2fsname(svname, NULL, &dash); + if (rc != 0) + return rc; - 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_flags |= MS_RDONLY; - sb->s_op = &server_ops; + if (*dash != '-') + return -EINVAL; - root = new_inode(sb); - if (!root) { - CERROR("Can't make root inode\n"); - RETURN(-EIO); - } + dash++; - /* returns -EIO for every operation */ - /* make_bad_inode(root); -- badness - can't umount */ - /* apparently we need to be a directory for the mount to finish */ - root->i_mode = S_IFDIR; + if (strncmp(dash, "MDT", 3) == 0) + rc = LDD_F_SV_TYPE_MDT; + else if (strncmp(dash, "OST", 3) == 0) + rc = LDD_F_SV_TYPE_OST; + else + return -EINVAL; - sb->s_root = d_alloc_root(root); - if (!sb->s_root) { - CERROR("Can't make root dentry\n"); - iput(root); - RETURN(-EIO); - } + dash += 3; - RETURN(0); -} + if (strcmp(dash, "all") == 0) + return rc | LDD_F_SV_ALL; -static int server_fill_super(struct super_block *sb) -{ - struct lustre_sb_info *lsi = s2lsi(sb); - struct vfsmount *mnt; - int rc; - ENTRY; + index = simple_strtoul(dash, (char **)endptr, 16); + *idx = index; - /* the One True Mount */ - mnt = server_kernel_mount(sb); - if (IS_ERR(mnt)) { - rc = PTR_ERR(mnt); - CERROR("Unable to mount device %s: %d\n", - lsi->lsi_lmd->lmd_dev, rc); - lustre_put_lsi(sb); - GOTO(out, rc); - } - lsi->lsi_srv_mnt = mnt; - - LASSERT(lsi->lsi_ldd); - CDEBUG(D_MOUNT, "Found service %s for fs '%s' on device %s\n", - lsi->lsi_ldd->ldd_svname, lsi->lsi_ldd->ldd_fsname, - lsi->lsi_lmd->lmd_dev); - - if (class_name2obd(lsi->lsi_ldd->ldd_svname)) { - LCONSOLE_ERROR_MSG(0x161, "The target named %s is already " - "running. Double-mount may have compromised" - " the disk journal.\n", - lsi->lsi_ldd->ldd_svname); - unlock_mntput(mnt); - lustre_put_lsi(sb); - GOTO(out, rc = -EALREADY); - } - - /* start MGS before MGC */ - 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); - } - - rc = lustre_start_mgc(sb); - if (rc) - GOTO(out_mnt, rc); - - /* Set up all obd devices for service */ - if (!(lsi->lsi_lmd->lmd_flags & LMD_FLG_NOSVC) && - (IS_OST(lsi->lsi_ldd) || IS_MDT(lsi->lsi_ldd))) { - rc = server_start_targets(sb, mnt); - if (rc < 0) { - CERROR("Unable to start targets: %d\n", rc); - GOTO(out_mnt, rc); - } - /* FIXME overmount client here, - or can we just start a client log and client_fill_super on this sb? - We need to make sure server_put_super gets called too - ll_put_super - calls lustre_common_put_super; check there for LSI_SERVER flag, - call s_p_s if so. - Probably should start client from new thread so we can return. - 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 */ - } - - 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: - server_put_super(sb); -out: - RETURN(rc); -} - -/* Get the index from the obd name. - rc = server type, or - rc < 0 on error - if endptr isn't NULL it is set to end of name */ -int server_name2index(char *svname, __u32 *idx, char **endptr) -{ - unsigned long index; - int rc; - char *dash = strchr(svname, '-'); - if (!dash) - 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); - - index = simple_strtoul(dash + 4, endptr, 16); - *idx = index; - return rc; + return rc; } +EXPORT_SYMBOL(server_name2index); /*************** mount common betweeen server and client ***************/ @@ -1663,27 +777,37 @@ int lustre_common_put_super(struct super_block *sb) } /* Drop a ref to the mounted disk */ lustre_put_lsi(sb); + lu_types_stop(); RETURN(rc); } +EXPORT_SYMBOL(lustre_common_put_super); -#if 0 static void lmd_print(struct lustre_mount_data *lmd) { - int i; - - PRINT_CMD(PRINT_MASK, " mount data:\n"); - if (lmd_is_client(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); - for (i = 0; i < lmd->lmd_exclude_count; i++) { - PRINT_CMD(PRINT_MASK, "exclude %d: OST%04x\n", i, - lmd->lmd_exclude[i]); - } + int i; + + PRINT_CMD(D_MOUNT, " mount data:\n"); + if (lmd_is_client(lmd)) + PRINT_CMD(D_MOUNT, "profile: %s\n", lmd->lmd_profile); + PRINT_CMD(D_MOUNT, "device: %s\n", lmd->lmd_dev); + PRINT_CMD(D_MOUNT, "flags: %x\n", lmd->lmd_flags); + + if (lmd->lmd_opts) + PRINT_CMD(D_MOUNT, "options: %s\n", lmd->lmd_opts); + + if (lmd->lmd_recovery_time_soft) + PRINT_CMD(D_MOUNT, "recovery time soft: %d\n", + lmd->lmd_recovery_time_soft); + + if (lmd->lmd_recovery_time_hard) + PRINT_CMD(D_MOUNT, "recovery time hard: %d\n", + lmd->lmd_recovery_time_hard); + + for (i = 0; i < lmd->lmd_exclude_count; i++) { + PRINT_CMD(D_MOUNT, "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) @@ -1712,9 +836,9 @@ int lustre_check_exclusion(struct super_block *sb, char *svname) } /* mount -v -o exclude=lustre-OST0001:lustre-OST0002 -t lustre ... */ -static int lmd_make_exclusion(struct lustre_mount_data *lmd, char *ptr) +static int lmd_make_exclusion(struct lustre_mount_data *lmd, const char *ptr) { - char *s1 = ptr, *s2; + const char *s1 = ptr, *s2; __u32 index, *exclude_list; int rc = 0, devmax; ENTRY; @@ -1766,7 +890,102 @@ 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; +} + +static int lmd_parse_string(char **handle, char *ptr) +{ + char *tail; + int length; + + if ((handle == NULL) || (ptr == NULL)) + return -EINVAL; + + if (*handle != NULL) { + OBD_FREE(*handle, strlen(*handle) + 1); + *handle = NULL; + } + + tail = strchr(ptr, ','); + if (tail == NULL) + length = strlen(ptr); + else + length = tail - ptr; + + OBD_ALLOC(*handle, length + 1); + if (*handle == NULL) + return -ENOMEM; + + memcpy(*handle, ptr, length); + (*handle)[length] = '\0'; + + return 0; +} + +/* Collect multiple values for mgsnid specifiers */ +static int lmd_parse_mgs(struct lustre_mount_data *lmd, char **ptr) +{ + lnet_nid_t nid; + char *tail = *ptr; + char *mgsnid; + int length; + int oldlen = 0; + + /* Find end of nidlist */ + while (class_parse_nid_quiet(tail, &nid, &tail) == 0) {} + length = tail - *ptr; + if (length == 0) { + LCONSOLE_ERROR_MSG(0x159, "Can't parse NID '%s'\n", *ptr); + return -EINVAL; + } + + if (lmd->lmd_mgs != NULL) + oldlen = strlen(lmd->lmd_mgs) + 1; + + OBD_ALLOC(mgsnid, oldlen + length + 1); + if (mgsnid == NULL) + return -ENOMEM; + + if (lmd->lmd_mgs != NULL) { + /* Multiple mgsnid= are taken to mean failover locations */ + memcpy(mgsnid, lmd->lmd_mgs, oldlen); + mgsnid[oldlen - 1] = ':'; + OBD_FREE(lmd->lmd_mgs, oldlen); + } + memcpy(mgsnid + oldlen, *ptr, length); + mgsnid[oldlen + length] = '\0'; + lmd->lmd_mgs = mgsnid; + *ptr = tail; + + 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; @@ -1790,11 +1009,18 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd) } lmd->lmd_magic = LMD_MAGIC; + OBD_ALLOC(lmd->lmd_params, 4096); + if (lmd->lmd_params == NULL) + RETURN(-ENOMEM); + lmd->lmd_params[0] = '\0'; + /* Set default flags here */ s1 = options; while (*s1) { int clear = 0; + int time_min = OBD_RECOVERY_TIME_MIN; + /* Skip whitespace and extra commas */ while (*s1 == ' ' || *s1 == ',') s1++; @@ -1807,18 +1033,83 @@ 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, "noscrub", 7) == 0) { + lmd->lmd_flags |= LMD_FLG_NOSCRUB; + clear++; + } else if (strncmp(s1, PARAM_MGSNODE, + sizeof(PARAM_MGSNODE) - 1) == 0) { + s2 = s1 + sizeof(PARAM_MGSNODE) - 1; + /* Assume the next mount opt is the first + invalid nid we get to. */ + rc = lmd_parse_mgs(lmd, &s2); + if (rc) + goto invalid; + clear++; + } else if (strncmp(s1, "writeconf", 9) == 0) { + lmd->lmd_flags |= LMD_FLG_WRITECONF; + clear++; + } else if (strncmp(s1, "update", 6) == 0) { + lmd->lmd_flags |= LMD_FLG_UPDATE; + clear++; + } else if (strncmp(s1, "virgin", 6) == 0) { + lmd->lmd_flags |= LMD_FLG_VIRGIN; + clear++; + } else if (strncmp(s1, "noprimnode", 10) == 0) { + lmd->lmd_flags |= LMD_FLG_NO_PRIMNODE; + 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); if (rc) goto invalid; clear++; + } else if (strncmp(s1, "mgs", 3) == 0) { + /* We are an MGS */ + lmd->lmd_flags |= LMD_FLG_MGS; + clear++; + } else if (strncmp(s1, "svname=", 7) == 0) { + rc = lmd_parse_string(&lmd->lmd_profile, s1 + 7); + if (rc) + goto invalid; + clear++; + } else if (strncmp(s1, "param=", 6) == 0) { + int length; + char *tail = strchr(s1 + 6, ','); + if (tail == NULL) + length = strlen(s1); + else + length = tail - s1; + length -= 6; + strncat(lmd->lmd_params, s1 + 6, length); + strcat(lmd->lmd_params, " "); + clear++; + } else if (strncmp(s1, "osd=", 4) == 0) { + rc = lmd_parse_string(&lmd->lmd_osd_type, s1 + 4); + if (rc) + goto invalid; + clear++; } /* Linux 2.4 doesn't pass the device, so we stuck it at the end of the options. */ @@ -1850,9 +1141,10 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd) goto invalid; } - s1 = strrchr(devname, ':'); + s1 = strstr(devname, ":/"); if (s1) { - lmd->lmd_flags = LMD_FLG_CLIENT; + ++s1; + lmd->lmd_flags |= LMD_FLG_CLIENT; /* Remove leading /s from fsname */ while (*++s1 == '/') ; /* Freed in lustre_free_lsi */ @@ -1880,6 +1172,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); @@ -1889,11 +1182,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; @@ -1905,10 +1207,21 @@ int lustre_fill_super(struct super_block *sb, void *data, int silent) RETURN(-ENOMEM); lmd = lsi->lsi_lmd; + /* + * Disable lockdep during mount, because mount locking patterns are + * `special'. + */ + 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); - RETURN(-EINVAL); + GOTO(out, rc = -EINVAL); } if (lmd_is_client(lmd)) { @@ -1917,71 +1230,81 @@ int lustre_fill_super(struct super_block *sb, void *data, int silent) LCONSOLE_ERROR_MSG(0x165, "Nothing registered for " "client mount! Is the 'lustre' " "module loaded?\n"); + lustre_put_lsi(sb); rc = -ENODEV; } else { rc = lustre_start_mgc(sb); if (rc) { - lustre_stop_mgc(sb); - goto out; + lustre_put_lsi(sb); + GOTO(out, rc); } /* 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 { - CDEBUG(D_MOUNT, "Mounting server from %s\n", lmd->lmd_dev); - lsi->lsi_flags |= LSI_SERVER; - rc = server_fill_super(sb); - /* s_f_s calls lustre_start_mgc after the mount because we need - the MGS nids which are stored on disk. Plus, we may - need to start the MGS first. */ - /* s_f_s will call server_put_super on failure */ +#ifdef HAVE_SERVER_SUPPORT + CDEBUG(D_MOUNT, "Mounting server from %s\n", lmd->lmd_dev); + rc = server_fill_super(sb); + /* s_f_s calls lustre_start_mgc after the mount because we need + the MGS nids which are stored on disk. Plus, we may + need to start the MGS first. */ + /* s_f_s will call server_put_super on failure */ +#else + CERROR("This is client-side-only module, " + "cannot handle server mount.\n"); + rc = -EINVAL; +#endif } + /* If error happens in fill_super() call, @lsi will be killed there. + * This is why we do not put it here. */ + GOTO(out, rc); out: - if (rc){ + if (rc) { CERROR("Unable to mount %s (%d)\n", s2lsi(sb) ? lmd->lmd_dev : "", rc); } else { - CDEBUG(D_SUPER, "mount %s complete\n", lmd->lmd_dev); + CDEBUG(D_SUPER, "Mount %s complete\n", + lmd->lmd_dev); } - RETURN(rc); + 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; } +EXPORT_SYMBOL(lustre_register_client_fill_super); void lustre_register_kill_super_cb(void (*cfs)(struct super_block *sb)) { kill_super_cb = cfs; } +EXPORT_SYMBOL(lustre_register_kill_super_cb); /***************** 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) +#ifdef HAVE_FSTYPE_MOUNT +struct dentry *lustre_mount(struct file_system_type *fs_type, int flags, + const char *devname, void *data) { - /* calls back in fill super */ - /* we could append devname= onto options (*data) here, - but 2.4 doesn't get devname. So we do it in mount_lustre.c */ - return get_sb_nodev(fs_type, flags, data, lustre_fill_super); + struct lustre_mount_data2 lmd2 = { data, NULL }; + + return mount_nodev(fs_type, flags, &lmd2, 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) { - /* calls back in fill super */ - /* we could append devname= onto options (*data) here, - but 2.4 doesn't get devname. So we do it in mount_lustre.c */ - 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 @@ -1989,18 +1312,25 @@ void lustre_kill_super(struct super_block *sb) { struct lustre_sb_info *lsi = s2lsi(sb); - if (kill_super_cb && lsi &&(lsi->lsi_flags & LSI_SERVER)) + if (kill_super_cb && lsi && !IS_SERVER(lsi)) (*kill_super_cb)(sb); kill_anon_super(sb); } +/** Register the "lustre" fs type + */ struct file_system_type lustre_fs_type = { .owner = THIS_MODULE, .name = "lustre", +#ifdef HAVE_FSTYPE_MOUNT + .mount = lustre_mount, +#else .get_sb = lustre_get_sb, +#endif .kill_sb = lustre_kill_super, - .fs_flags = FS_BINARY_MOUNTDATA | FS_REQUIRES_DEV, + .fs_flags = FS_BINARY_MOUNTDATA | FS_REQUIRES_DEV | + FS_HAS_FIEMAP | FS_RENAME_DOES_D_MOVE, }; int lustre_register_fs(void) @@ -2012,19 +1342,3 @@ int lustre_unregister_fs(void) { return unregister_filesystem(&lustre_fs_type); } - -EXPORT_SYMBOL(lustre_register_client_fill_super); -EXPORT_SYMBOL(lustre_register_kill_super_cb); -EXPORT_SYMBOL(lustre_common_put_super); -EXPORT_SYMBOL(lustre_process_log); -EXPORT_SYMBOL(lustre_end_log); -EXPORT_SYMBOL(server_get_mount); -EXPORT_SYMBOL(server_get_mount_2); -EXPORT_SYMBOL(server_put_mount); -EXPORT_SYMBOL(server_put_mount_2); -EXPORT_SYMBOL(server_register_target); -EXPORT_SYMBOL(server_name2index); -EXPORT_SYMBOL(server_mti_print); -EXPORT_SYMBOL(do_lcfg); - -