|
@@ -1,6 +1,6 @@
|
|
|
/*
|
|
|
* Copyright (C) 2010-2011 Neil Brown
|
|
|
- * Copyright (C) 2010-2017 Red Hat, Inc. All rights reserved.
|
|
|
+ * Copyright (C) 2010-2018 Red Hat, Inc. All rights reserved.
|
|
|
*
|
|
|
* This file is released under the GPL.
|
|
|
*/
|
|
@@ -2626,7 +2626,7 @@ static int rs_adjust_data_offsets(struct raid_set *rs)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
- /* HM FIXME: get InSync raid_dev? */
|
|
|
+ /* HM FIXME: get In_Sync raid_dev? */
|
|
|
rdev = &rs->dev[0].rdev;
|
|
|
|
|
|
if (rs->delta_disks < 0) {
|
|
@@ -3224,6 +3224,8 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv)
|
|
|
/* Start raid set read-only and assumed clean to change in raid_resume() */
|
|
|
rs->md.ro = 1;
|
|
|
rs->md.in_sync = 1;
|
|
|
+
|
|
|
+ /* Keep array frozen */
|
|
|
set_bit(MD_RECOVERY_FROZEN, &rs->md.recovery);
|
|
|
|
|
|
/* Has to be held on running the array */
|
|
@@ -3247,7 +3249,7 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv)
|
|
|
rs->callbacks.congested_fn = raid_is_congested;
|
|
|
dm_table_add_target_callbacks(ti->table, &rs->callbacks);
|
|
|
|
|
|
- /* If raid4/5/6 journal mode explictely requested (only possible with journal dev) -> set it */
|
|
|
+ /* If raid4/5/6 journal mode explicitly requested (only possible with journal dev) -> set it */
|
|
|
if (test_bit(__CTR_FLAG_JOURNAL_MODE, &rs->ctr_flags)) {
|
|
|
r = r5c_journal_mode_set(&rs->md, rs->journal_dev.mode);
|
|
|
if (r) {
|
|
@@ -4012,7 +4014,7 @@ static void raid_resume(struct dm_target *ti)
|
|
|
|
|
|
static struct target_type raid_target = {
|
|
|
.name = "raid",
|
|
|
- .version = {1, 13, 2},
|
|
|
+ .version = {1, 14, 0},
|
|
|
.module = THIS_MODULE,
|
|
|
.ctr = raid_ctr,
|
|
|
.dtr = raid_dtr,
|