Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
LU-6485 libcfs: embed kr_data into kkuc_reg
[fs/lustre-release.git]
/
lustre
/
obdclass
/
obd_mount_server.c
diff --git
a/lustre/obdclass/obd_mount_server.c
b/lustre/obdclass/obd_mount_server.c
index
a669f56
..
ef453b0
100644
(file)
--- a/
lustre/obdclass/obd_mount_server.c
+++ b/
lustre/obdclass/obd_mount_server.c
@@
-264,8
+264,14
@@
static int server_stop_mgs(struct super_block *sb)
{
struct obd_device *obd;
int rc;
+ struct lustre_mount_info *lmi;
ENTRY;
+ /* Do not stop MGS if this device is not the running MGT */
+ lmi = server_find_mount(LUSTRE_MGS_OBDNAME);
+ if (lmi != NULL && lmi->lmi_sb != sb)
+ RETURN(0);
+
CDEBUG(D_MOUNT, "Stop MGS service %s\n", LUSTRE_MGS_OBDNAME);
/* There better be only one MGS */
@@
-533,7
+539,8
@@
static int lustre_lwp_connect(struct obd_device *lwp)
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_LIGHTWEIGHT | OBD_CONNECT_LFSCK |
+ OBD_CONNECT_BULK_MBITS;
OBD_ALLOC_PTR(uuid);
if (uuid == NULL)
GOTO(out, rc = -ENOMEM);
@@
-877,7
+884,7
@@
static int lustre_disconnect_lwp(struct super_block *sb)
/* end log first */
cfg->cfg_instance = sb;
rc = lustre_end_log(sb, logname, cfg);
- if (rc != 0)
+ if (rc != 0
&& rc != -ENOENT
)
GOTO(out, rc);
lsi->lsi_lwp_started = 0;
@@
-986,8
+993,8
@@
static int lustre_start_lwp(struct super_block *sb)
cfg->cfg_callback = client_lwp_config_process;
cfg->cfg_instance = sb;
rc = lustre_process_log(sb, logname, cfg);
- if (rc == 0)
-
lsi->lsi_lwp_started = 1;
+ /* need to remove config llog from mgc */
+ lsi->lsi_lwp_started = 1;
GOTO(out, rc);
@@
-1047,7
+1054,6
@@
int server_mti_print(const char *title, struct mgs_target_info *mti)
mti->mti_config_ver, mti->mti_flags);
return 0;
}
-EXPORT_SYMBOL(server_mti_print);
/* Generate data for registration */
static int server_lsi2mti(struct lustre_sb_info *lsi,
@@
-1164,8
+1170,8
@@
static int server_register_target(struct lustre_sb_info *lsi)
"rc = %d. Is the MGS running?\n",
lsi->lsi_svname, rc);
} else {
- C
ERROR("%s: error registering with the MGS: rc = %d
"
- "(not fatal)\n", lsi->lsi_svname, rc);
+ C
DEBUG(D_HA, "%s: error registering with the MGS:
"
+ "
rc = %d
(not fatal)\n", lsi->lsi_svname, rc);
/* reset the error code for non-fatal error. */
rc = 0;
}
@@
-1481,9
+1487,13
@@
static void server_put_super(struct super_block *sb)
If there are any setup/cleanup errors, save the lov
name for safety cleanup later. */
lprof = class_get_profile(lsi->lsi_svname);
- if (lprof && lprof->lp_dt) {
- OBD_ALLOC(extraname, strlen(lprof->lp_dt) + 1);
- strcpy(extraname, lprof->lp_dt);
+ if (lprof != NULL) {
+ if (lprof->lp_dt != NULL) {
+ OBD_ALLOC(extraname, strlen(lprof->lp_dt) + 1);
+ strncpy(extraname, lprof->lp_dt,
+ strlen(lprof->lp_dt) + 1);
+ }
+ class_put_profile(lprof);
}
obd = class_name2obd(lsi->lsi_svname);
@@
-1868,4
+1878,3
@@
void server_calc_timeout(struct lustre_sb_info *lsi, struct obd_device *obd)
obd->obd_recovery_time_hard = hard;
obd->obd_recovery_ir_factor = factor;
}
-EXPORT_SYMBOL(server_calc_timeout);