X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Fobd_mount.c;h=bb4dd25f09d21a87e1b852dd1a5d7c0236e8706c;hp=12ca9c32020d64665922fc65bac474238034111d;hb=1a24dcdce121787428ea820561cfa16ae24bdf82;hpb=5038bf8db83d4cb409b7563f028f48cca0385c19 diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c index 12ca9c3..bb4dd25 100644 --- a/lustre/obdclass/obd_mount.c +++ b/lustre/obdclass/obd_mount.c @@ -1334,12 +1334,13 @@ int lmd_parse(char *options, struct lustre_mount_data *lmd) * Parse non-ldiskfs options here. Rather than modifying * ldiskfs, we just zero these out here */ - if (strncmp(s1, "abort_recov", 11) == 0) { - lmd->lmd_flags |= LMD_FLG_ABORT_RECOV; - clear++; - } else if (strncmp(s1, "abort_recov_mdt", 15) == 0) { + if (!strncmp(s1, "abort_recov_mdt", 15) || + !strncmp(s1, "abort_recovery_mdt", 18)) { lmd->lmd_flags |= LMD_FLG_ABORT_RECOV_MDT; clear++; + } else 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),