diff options
author | NeilBrown <neilb@suse.de> | 2008-10-27 10:10:08 +1100 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2008-10-27 10:10:08 +1100 |
commit | b01b06bda8dce132e6eb3c3826ad0f4b94ebdf43 (patch) | |
tree | 6344c839508876df740b6fd7326ef2323c6f8142 /mdadm.c | |
parent | 4abe6b708687f9982bfbc0629e1070bf49714fa3 (diff) | |
parent | b3d3195538e315b3863235731112eee7398d4340 (diff) | |
download | mdadm-b01b06bda8dce132e6eb3c3826ad0f4b94ebdf43.tar.gz mdadm-b01b06bda8dce132e6eb3c3826ad0f4b94ebdf43.tar.xz mdadm-b01b06bda8dce132e6eb3c3826ad0f4b94ebdf43.zip |
Merge branch 'master' into devel-3.0
Conflicts:
Create.c
Manage.c
Diffstat (limited to 'mdadm.c')
-rw-r--r-- | mdadm.c | 21 |
1 files changed, 6 insertions, 15 deletions
@@ -361,6 +361,12 @@ int main(int argc, char *argv[]) writemostly = 1; continue; + case O(MANAGE,'w'): + /* clear write-mostly for following devices */ + writemostly = 2; + continue; + + case O(GROW,'z'): case O(CREATE,'z'): /* size */ if (size >= 0) { @@ -747,21 +753,6 @@ int main(int argc, char *argv[]) runstop = -1; continue; - case O(MANAGE,'o'): - if (readonly < 0) { - fprintf(stderr, Name ": Cannot have both readonly and readwrite\n"); - exit(2); - } - readonly = 1; - continue; - case O(MANAGE,'w'): - if (readonly > 0) { - fprintf(stderr, Name ": Cannot have both readwrite and readonly.\n"); - exit(2); - } - readonly = -1; - continue; - case O(MISC,'Q'): case O(MISC,'D'): case O(MISC,'E'): |