* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2013, 2015, Intel Corporation.
+ * Copyright (c) 2013, 2017, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#define PRINT_MASK (D_SUPER | D_CONFIG)
#include <linux/types.h>
+#ifdef HAVE_LINUX_SELINUX_IS_ENABLED
#include <linux/selinux.h>
+#endif
#include <linux/statfs.h>
#include <linux/version.h>
-#ifdef HAVE_KERNEL_LOCKED
-#include <linux/smp_lock.h>
-#endif
-
-#include <lustre/lustre_idl.h>
-#include <lustre/lustre_user.h>
+#include <linux/delay.h>
#include <llog_swab.h>
#include <lustre_disk.h>
-#include <lustre_ioctl.h>
+#include <uapi/linux/lustre/lustre_ioctl.h>
#include <lustre_log.h>
-#include <lustre_param.h>
+#include <uapi/linux/lustre/lustre_param.h>
#include <obd.h>
#include <obd_class.h>
/*********** mount lookup *********/
static DEFINE_MUTEX(lustre_mount_info_lock);
-static struct list_head server_mount_info_list =
- LIST_HEAD_INIT(server_mount_info_list);
+static LIST_HEAD(server_mount_info_list);
static struct lustre_mount_info *server_find_mount(const char *name)
{
}
EXPORT_SYMBOL(tgt_name2lwp_name);
-static struct list_head lwp_register_list =
- LIST_HEAD_INIT(lwp_register_list);
+static LIST_HEAD(lwp_register_list);
static DEFINE_SPINLOCK(lwp_register_list_lock);
static void lustre_put_lwp_item(struct lwp_register_item *lri)
void lustre_deregister_lwp_item(struct obd_export **exp)
{
struct lwp_register_item *lri;
+ bool removed = false;
+ int repeat = 0;
spin_lock(&lwp_register_list_lock);
list_for_each_entry(lri, &lwp_register_list, lri_list) {
if (exp == lri->lri_exp) {
list_del_init(&lri->lri_list);
- spin_unlock(&lwp_register_list_lock);
-
- lustre_put_lwp_item(lri);
- return;
+ removed = true;
+ break;
}
}
spin_unlock(&lwp_register_list_lock);
+
+ if (!removed)
+ return;
+
+ /* See lustre_notify_lwp_list(), in some extreme race conditions,
+ * the notify callback could be still on the fly, we need to wait
+ * for the callback done before moving on to free the data used
+ * by callback. */
+ while (atomic_read(&lri->lri_ref) > 1) {
+ CDEBUG(D_MOUNT, "lri reference count %u, repeat: %d\n",
+ atomic_read(&lri->lri_ref), repeat);
+ repeat++;
+ set_current_state(TASK_INTERRUPTIBLE);
+ schedule_timeout(cfs_time_seconds(1));
+ }
+ lustre_put_lwp_item(lri);
}
EXPORT_SYMBOL(lustre_deregister_lwp_item);
}
snprintf(lwp_name, sizeof(lwp_name), "%s-MDT%04x", fsname, idx);
- spin_lock(&lsi->lsi_lwp_lock);
+ mutex_lock(&lsi->lsi_lwp_mutex);
list_for_each_entry(lwp, &lsi->lsi_lwp_list, obd_lwp_list) {
char *ptr = strstr(lwp->obd_name, lwp_name);
break;
}
}
- spin_unlock(&lsi->lsi_lwp_lock);
+ mutex_unlock(&lsi->lsi_lwp_mutex);
err_lmi:
server_put_mount(dev, false);
}
EXPORT_SYMBOL(lustre_notify_lwp_list);
-static int lustre_lwp_connect(struct obd_device *lwp)
+static int lustre_lwp_connect(struct obd_device *lwp, bool is_mdt)
{
struct lu_env env;
struct lu_context session_ctx;
data->ocd_connect_flags = OBD_CONNECT_VERSION | OBD_CONNECT_INDEX;
data->ocd_version = LUSTRE_VERSION_CODE;
- data->ocd_connect_flags |= OBD_CONNECT_MDS_MDS | OBD_CONNECT_FID |
- OBD_CONNECT_AT | OBD_CONNECT_LRU_RESIZE |
- OBD_CONNECT_FULL20 | OBD_CONNECT_LVB_TYPE |
- OBD_CONNECT_LIGHTWEIGHT | OBD_CONNECT_LFSCK |
- OBD_CONNECT_BULK_MBITS;
+ data->ocd_connect_flags |= OBD_CONNECT_FID | OBD_CONNECT_AT |
+ OBD_CONNECT_LRU_RESIZE | OBD_CONNECT_FULL20 |
+ OBD_CONNECT_LVB_TYPE | OBD_CONNECT_LIGHTWEIGHT |
+ OBD_CONNECT_LFSCK | OBD_CONNECT_BULK_MBITS;
+
+ if (is_mdt)
+ data->ocd_connect_flags |= OBD_CONNECT_MDS_MDS;
+
OBD_ALLOC_PTR(uuid);
if (uuid == NULL)
GOTO(out, rc = -ENOMEM);
obd = class_name2obd(lwpname);
LASSERT(obd != NULL);
- rc = lustre_lwp_connect(obd);
+ rc = lustre_lwp_connect(obd, strstr(lsi->lsi_svname, "-MDT") != NULL);
if (rc == 0) {
obd->u.cli.cl_max_mds_easize = MAX_MD_SIZE;
- spin_lock(&lsi->lsi_lwp_lock);
+ mutex_lock(&lsi->lsi_lwp_mutex);
list_add_tail(&obd->obd_lwp_list, &lsi->lsi_lwp_list);
- spin_unlock(&lsi->lsi_lwp_lock);
+ mutex_unlock(&lsi->lsi_lwp_mutex);
} else {
CERROR("%s: connect failed: rc = %d\n", lwpname, rc);
}
lustre_cfg_bufs_set_string(bufs, 1,
lustre_cfg_string(cfg, 1));
- lcfg = lustre_cfg_new(LCFG_ADD_CONN, bufs);
- if (lcfg == NULL)
+ OBD_ALLOC(lcfg, lustre_cfg_len(bufs->lcfg_bufcount, bufs->lcfg_buflen));
+ if (!lcfg)
GOTO(out_cfg, rc = -ENOMEM);
+ lustre_cfg_init(lcfg, LCFG_ADD_CONN, bufs);
+
rc = class_add_conn(lwp, lcfg);
if (rc)
CERROR("%s: can't add conn: rc = %d\n", lwpname, rc);
- if (lcfg != NULL)
- lustre_cfg_free(lcfg);
+ if (lcfg)
+ OBD_FREE(lcfg, lustre_cfg_len(lcfg->lcfg_bufcount,
+ lcfg->lcfg_buflens));
out_cfg:
if (bufs != NULL)
OBD_FREE_PTR(bufs);
GOTO(out, rc = -ENOMEM);
/* end log first */
- cfg->cfg_instance = sb;
+ cfg->cfg_instance = ll_get_cfg_instance(sb);
rc = lustre_end_log(sb, logname, cfg);
if (rc != 0 && rc != -ENOENT)
GOTO(out, rc);
if (bufs == NULL)
GOTO(out, rc = -ENOMEM);
+ mutex_lock(&lsi->lsi_lwp_mutex);
list_for_each_entry(lwp, &lsi->lsi_lwp_list, obd_lwp_list) {
struct lustre_cfg *lcfg;
lustre_cfg_bufs_reset(bufs, lwp->obd_name);
lustre_cfg_bufs_set_string(bufs, 1, NULL);
- lcfg = lustre_cfg_new(LCFG_CLEANUP, bufs);
- if (lcfg == NULL)
- GOTO(out, rc = -ENOMEM);
+ OBD_ALLOC(lcfg, lustre_cfg_len(bufs->lcfg_bufcount,
+ bufs->lcfg_buflen));
+ if (!lcfg) {
+ rc = -ENOMEM;
+ break;
+ }
+ lustre_cfg_init(lcfg, LCFG_CLEANUP, bufs);
/* Disconnect import first. NULL is passed for the '@env',
* since it will not be used. */
rc = lwp->obd_lu_dev->ld_ops->ldo_process_config(NULL,
lwp->obd_lu_dev, lcfg);
- lustre_cfg_free(lcfg);
+ OBD_FREE(lcfg, lustre_cfg_len(lcfg->lcfg_bufcount,
+ lcfg->lcfg_buflens));
if (rc != 0 && rc != -ETIMEDOUT) {
CERROR("%s: fail to disconnect LWP: rc = %d\n",
lwp->obd_name, rc);
rc1 = rc;
}
}
+ mutex_unlock(&lsi->lsi_lwp_mutex);
GOTO(out, rc);
int rc1 = 0;
ENTRY;
+ mutex_lock(&lsi->lsi_lwp_mutex);
while (!list_empty(&lsi->lsi_lwp_list)) {
lwp = list_entry(lsi->lsi_lwp_list.next, struct obd_device,
obd_lwp_list);
list_del_init(&lwp->obd_lwp_list);
lwp->obd_force = 1;
+ mutex_unlock(&lsi->lsi_lwp_mutex);
+
rc = class_manual_cleanup(lwp);
if (rc != 0) {
CERROR("%s: fail to stop LWP: rc = %d\n",
lwp->obd_name, rc);
rc1 = rc;
}
+ mutex_lock(&lsi->lsi_lwp_mutex);
}
+ mutex_unlock(&lsi->lsi_lwp_mutex);
RETURN(rc1 != 0 ? rc1 : rc);
}
GOTO(out, rc = -ENOMEM);
cfg->cfg_callback = client_lwp_config_process;
- cfg->cfg_instance = sb;
+ cfg->cfg_instance = ll_get_cfg_instance(sb);
rc = lustre_process_log(sb, logname, cfg);
/* need to remove config llog from mgc */
lsi->lsi_lwp_started = 1;
struct obd_device *obd = NULL;
struct obd_type *type = NULL;
int rc = 0;
+ bool type_last;
ENTRY;
mutex_lock(&server_start_lock);
/* if this was an MDT, and there are no more MDT's, clean up the MDS */
if (lsiflags & LDD_F_SV_TYPE_MDT) {
obd = class_name2obd(LUSTRE_MDS_OBDNAME);
- if (obd != NULL)
- type = class_search_type(LUSTRE_MDT_NAME);
- }
-
+ type = class_search_type(LUSTRE_MDT_NAME);
+ } else if (lsiflags & LDD_F_SV_TYPE_OST) {
/* if this was an OST, and there are no more OST's, clean up the OSS */
- if (lsiflags & LDD_F_SV_TYPE_OST) {
obd = class_name2obd(LUSTRE_OSS_OBDNAME);
- if (obd != NULL)
- type = class_search_type(LUSTRE_OST_NAME);
+ type = class_search_type(LUSTRE_OST_NAME);
}
- if (obd != NULL && (type == NULL || type->typ_refcnt == 0)) {
+ /* server_stop_servers is a pair of server_start_targets
+ * Here we put type which was taken at server_start_targets.
+ * If type is NULL then there is a wrong logic around type or
+ * type reference. */
+ LASSERTF(type, "Server flags %d, obd %s\n", lsiflags,
+ obd ? obd->obd_name : "NULL");
+
+ type_last = (atomic_read(&type->typ_refcnt) == 1);
+
+ class_put_type(type);
+ if (obd != NULL && type_last) {
obd->obd_force = 1;
/* obd_fail doesn't mean much on a server obd */
rc = class_manual_cleanup(obd);
}
+ /* put reference taken by class_search_type */
+ kobject_put(&type->typ_kobj);
+
mutex_unlock(&server_start_lock);
RETURN(rc);
static int server_lsi2mti(struct lustre_sb_info *lsi,
struct mgs_target_info *mti)
{
- lnet_process_id_t id;
+ struct lnet_process_id id;
int rc, i = 0;
int cplen = 0;
ENTRY;
struct mgs_target_info *mti = NULL;
bool writeconf;
int rc;
+ int tried = 0;
ENTRY;
LASSERT(mgc);
writeconf = !!(lsi->lsi_flags & (LDD_F_NEED_INDEX | LDD_F_UPDATE));
mti->mti_flags |= LDD_F_OPC_REG;
+again:
/* Register the target */
/* FIXME use mgc_process_config instead */
rc = obd_set_info_async(NULL, mgc->u.cli.cl_mgc_mgsexp,
"to start: rc = %d. Please see messages on "
"the MGS.\n", lsi->lsi_svname, rc);
} else if (writeconf) {
+ if ((rc == -ESHUTDOWN || rc == -EIO) && ++tried < 5) {
+ /* The connection with MGS is not established.
+ * Try again after 2 seconds. Interruptable. */
+ set_current_state(TASK_INTERRUPTIBLE);
+ schedule_timeout(cfs_time_seconds(2));
+ set_current_state(TASK_RUNNING);
+ if (!signal_pending(current))
+ goto again;
+ }
+
LCONSOLE_ERROR_MSG(0x15f,
"%s: cannot register this server with the MGS: "
"rc = %d. Is the MGS running?\n",
struct config_llog_instance cfg;
struct lu_env mgc_env;
struct lu_device *dev;
+ char *name_service, *obd_name_service = NULL;
+ struct obd_type *type = NULL;
int rc;
ENTRY;
CDEBUG(D_MOUNT, "starting target %s\n", lsi->lsi_svname);
+ LASSERTF(IS_MDT(lsi) || IS_OST(lsi), "designed for MDT or OST only\n");
+
if (IS_MDT(lsi)) {
- /* make sure the MDS is started */
- mutex_lock(&server_start_lock);
- obd = class_name2obd(LUSTRE_MDS_OBDNAME);
- if (!obd) {
- rc = lustre_start_simple(LUSTRE_MDS_OBDNAME,
- LUSTRE_MDS_NAME,
- LUSTRE_MDS_OBDNAME"_uuid",
- NULL, NULL, NULL, NULL);
- if (rc) {
- mutex_unlock(&server_start_lock);
- CERROR("failed to start MDS: %d\n", rc);
- RETURN(rc);
- }
- }
- mutex_unlock(&server_start_lock);
+ obd_name_service = LUSTRE_MDS_OBDNAME;
+ name_service = LUSTRE_MDS_NAME;
+ } else {
+ obd_name_service = LUSTRE_OSS_OBDNAME;
+ name_service = LUSTRE_OSS_NAME;
}
- /* If we're an OST, make sure the global OSS is running */
- if (IS_OST(lsi)) {
- /* make sure OSS is started */
- mutex_lock(&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",
- NULL, NULL, NULL, NULL);
- if (rc) {
- mutex_unlock(&server_start_lock);
- CERROR("failed to start OSS: %d\n", rc);
- RETURN(rc);
- }
+ /* make sure MDS/OSS is started */
+ mutex_lock(&server_start_lock);
+ obd = class_name2obd(obd_name_service);
+ if (!obd) {
+ rc = lustre_start_simple(obd_name_service, name_service,
+ (IS_MDT(lsi) ?
+ LUSTRE_MDS_OBDNAME"_uuid" :
+ LUSTRE_OSS_OBDNAME"_uuid"),
+ NULL, NULL, NULL, NULL);
+ if (rc) {
+ mutex_unlock(&server_start_lock);
+ CERROR("failed to start %s: %d\n",
+ obd_name_service, rc);
+ RETURN(rc);
}
+ }
+ /* hold a type reference and put it at server_stop_servers */
+ type = class_get_type(IS_MDT(lsi) ?
+ LUSTRE_MDT_NAME : LUSTRE_OST_NAME);
+ if (!type) {
mutex_unlock(&server_start_lock);
+ GOTO(out_stop_service, rc = -ENODEV);
+ }
+ lsi->lsi_server_started = 1;
+ mutex_unlock(&server_start_lock);
+ if (OBD_FAIL_PRECHECK(OBD_FAIL_OBD_STOP_MDS_RACE) &&
+ IS_MDT(lsi)) {
+ OBD_RACE(OBD_FAIL_OBD_STOP_MDS_RACE);
+ msleep(2 * MSEC_PER_SEC);
}
rc = lu_env_init(&mgc_env, LCT_MG_THREAD);
/* Start targets using the llog named for the target */
memset(&cfg, 0, sizeof(cfg));
cfg.cfg_callback = class_config_llog_handler;
+ cfg.cfg_sub_clds = CONFIG_SUB_SERVER;
rc = lustre_process_log(sb, lsi->lsi_svname, &cfg);
if (rc) {
CERROR("failed to start server %s: %d\n",
/* 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);
-
/* log has been fully processed, let clients connect */
dev = obd->obd_lu_dev;
if (dev && dev->ld_ops->ldo_prepare) {
out_env:
lu_env_fini(&mgc_env);
out_stop_service:
- if (rc != 0)
- server_stop_servers(lsi->lsi_flags);
+ /* in case of error upper function call
+ * server_put_super->server_stop_servers()
+ */
RETURN(rc);
}
char *tmpname, *extraname = NULL;
int tmpname_sz;
int lsiflags = lsi->lsi_flags;
+ bool stop_servers = lsi->lsi_server_started;
ENTRY;
LASSERT(IS_SERVER(lsi));
* to .put_super, so we better make sure we clean up! */
obd->obd_force = 1;
class_manual_cleanup(obd);
+ if (OBD_FAIL_PRECHECK(OBD_FAIL_OBD_STOP_MDS_RACE)) {
+ int idx;
+ server_name2index(lsi->lsi_svname, &idx, NULL);
+ /* sleeping for MDT0001 */
+ if (idx == 1)
+ OBD_RACE(OBD_FAIL_OBD_STOP_MDS_RACE);
+ }
} else {
CERROR("no obd %s\n", lsi->lsi_svname);
server_deregister_mount(lsi->lsi_svname);
/* 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(lsiflags);
+ if (stop_servers)
+ server_stop_servers(lsiflags);
/* In case of startup or cleanup err, stop related obds */
if (extraname) {
RETURN(0);
}
+#ifdef HAVE_SUPEROPS_USE_DENTRY
+int server_show_options(struct seq_file *seq, struct dentry *dentry)
+#else
+int server_show_options(struct seq_file *seq, struct vfsmount *vfs)
+#endif
+{
+ struct lustre_sb_info *lsi;
+ struct lustre_mount_data *lmd;
+
+#ifdef HAVE_SUPEROPS_USE_DENTRY
+ LASSERT(seq != NULL && dentry != NULL);
+ lsi = s2lsi(dentry->d_sb);
+#else
+ LASSERT(seq != NULL && vfs != NULL);
+ lsi = s2lsi(vfs->mnt_sb);
+#endif
+
+ lmd = lsi->lsi_lmd;
+ seq_printf(seq, ",svname=%s", lmd->lmd_profile);
+
+ if (lmd->lmd_flags & LMD_FLG_ABORT_RECOV)
+ seq_puts(seq, ",abort_recov");
+
+ if (lmd->lmd_flags & LMD_FLG_NOIR)
+ seq_puts(seq, ",noir");
+
+ if (lmd->lmd_flags & LMD_FLG_NOSVC)
+ seq_puts(seq, ",nosvc");
+
+ if (lmd->lmd_flags & LMD_FLG_NOMGS)
+ seq_puts(seq, ",nomgs");
+
+ if (lmd->lmd_flags & LMD_FLG_NOSCRUB)
+ seq_puts(seq, ",noscrub");
+ if (lmd->lmd_flags & LMD_FLG_SKIP_LFSCK)
+ seq_puts(seq, ",skip_lfsck");
+
+ if (lmd->lmd_flags & LMD_FLG_DEV_RDONLY)
+ seq_puts(seq, ",rdonly_dev");
+
+ if (lmd->lmd_flags & LMD_FLG_MGS)
+ seq_puts(seq, ",mgs");
+
+ if (lmd->lmd_mgs != NULL)
+ seq_printf(seq, ",mgsnode=%s", lmd->lmd_mgs);
+
+ if (lmd->lmd_osd_type != NULL)
+ seq_printf(seq, ",osd=%s", lmd->lmd_osd_type);
+
+ if (lmd->lmd_opts != NULL) {
+ seq_putc(seq, ',');
+ seq_puts(seq, lmd->lmd_opts);
+ }
+
+ RETURN(0);
+}
+
/** The operations we support directly on the superblock:
* mount, umount, and df.
*/
.put_super = server_put_super,
.umount_begin = server_umount_begin, /* umount -f */
.statfs = server_statfs,
+ .show_options = server_show_options,
};
/*
* Xattr support for Lustre servers
*/
+#ifdef HAVE_IOP_XATTR
static ssize_t lustre_getxattr(struct dentry *dentry, const char *name,
void *buffer, size_t size)
{
{
return -EOPNOTSUPP;
}
+#endif
static ssize_t lustre_listxattr(struct dentry *d_entry, char *name,
size_t size)
return -EOPNOTSUPP;
}
+static bool is_cmd_supported(unsigned int command)
+{
+ switch (command) {
+ case FITRIM:
+ return true;
+ default:
+ return false;
+ }
+
+ return false;
+}
+
+static long server_ioctl(struct file *filp, unsigned int command,
+ unsigned long arg)
+{
+ struct file active_filp;
+ struct inode *inode = file_inode(filp);
+ struct lustre_sb_info *lsi = s2lsi(inode->i_sb);
+ struct super_block *dd_sb = dt_mnt_sb_get(lsi->lsi_dt_dev);
+ struct inode *active_inode;
+ int err = -EOPNOTSUPP;
+
+ if (IS_ERR(dd_sb) || !is_cmd_supported(command))
+ return err;
+
+ active_inode = igrab(dd_sb->s_root->d_inode);
+ if (!active_inode)
+ return -EACCES;
+
+ active_filp.f_inode = active_inode;
+ if (active_inode->i_fop && active_inode->i_fop->unlocked_ioctl)
+ err = active_inode->i_fop->unlocked_ioctl(&active_filp,
+ command, arg);
+ iput(active_inode);
+ return err;
+}
+
static const struct inode_operations server_inode_operations = {
+#ifdef HAVE_IOP_XATTR
.setxattr = lustre_setxattr,
.getxattr = lustre_getxattr,
+#endif
.listxattr = lustre_listxattr,
};
+static const struct file_operations server_file_operations = {
+ .unlocked_ioctl = server_ioctl,
+};
+
#define log2(n) ffz(~(n))
#define LUSTRE_SUPER_MAGIC 0x0BD00BD1
sb->s_blocksize_bits = log2(sb->s_blocksize);
sb->s_magic = LUSTRE_SUPER_MAGIC;
sb->s_maxbytes = 0; /* we don't allow file IO on server mountpoints */
- sb->s_flags |= MS_RDONLY;
+ sb->s_flags |= SB_RDONLY;
sb->s_op = &server_ops;
root = new_inode(sb);
/* apparently we need to be a directory for the mount to finish */
root->i_mode = S_IFDIR;
root->i_op = &server_inode_operations;
+ root->i_fop = &server_file_operations;
sb->s_root = d_make_root(root);
if (!sb->s_root) {
CERROR("%s: can't make root dentry\n", sb->s_id);
static int osd_start(struct lustre_sb_info *lsi, unsigned long mflags)
{
struct lustre_mount_data *lmd = lsi->lsi_lmd;
- struct obd_device *obd;
- struct dt_device_param p;
- char flagstr[16];
- int rc;
+ struct obd_device *obd;
+ struct dt_device_param p;
+ char flagstr[20 + 1 + 10 + 1];
+ int rc;
ENTRY;
CDEBUG(D_MOUNT,
sprintf(lsi->lsi_osd_obdname, "%s-osd", lsi->lsi_svname);
strcpy(lsi->lsi_osd_uuid, lsi->lsi_osd_obdname);
strcat(lsi->lsi_osd_uuid, "_UUID");
- sprintf(flagstr, "%lu:%lu", mflags, (unsigned long) lmd->lmd_flags);
+ snprintf(flagstr, sizeof(flagstr), "%lu:%u", mflags, lmd->lmd_flags);
obd = class_name2obd(lsi->lsi_osd_obdname);
if (obd == NULL) {
OBD_RACE(OBD_FAIL_TGT_MOUNT_RACE);
rc = lsi_prepare(lsi);
- if (rc)
+ if (rc) {
+ lustre_put_lsi(sb);
RETURN(rc);
+ }
/* Start low level OSD */
rc = osd_start(lsi, sb->s_flags);
}
/* we're done */
- obd->obd_recovery_timeout = max(obd->obd_recovery_timeout, soft);
+ obd->obd_recovery_timeout = max_t(time64_t, obd->obd_recovery_timeout,
+ soft);
obd->obd_recovery_time_hard = hard;
obd->obd_recovery_ir_factor = factor;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff