]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
Create: support --readonly flag.
authorNeilBrown <neilb@suse.de>
Mon, 9 Jul 2012 07:14:17 +0000 (17:14 +1000)
committerNeilBrown <neilb@suse.de>
Mon, 9 Jul 2012 07:14:17 +0000 (17:14 +1000)
Allow array to be created read-only

Signed-off-by: NeilBrown <neilb@suse.de>
Create.c
mdadm.c
mdadm.h

index af094952e834f568224cd5c84bef55bb5879a326..ed6d2ae33ffad6a1db0cf88ae93cf1fee5b0c623 100644 (file)
--- a/Create.c
+++ b/Create.c
@@ -67,7 +67,8 @@ int Create(struct supertype *st, char *mddev,
           int raiddisks, int sparedisks,
           char *name, char *homehost, int *uuid,
           int subdevs, struct mddev_dev *devlist,
-          int runstop, int verbose, int force, int assume_clean,
+          int runstop, int readonly, int verbose,
+          int force, int assume_clean,
           char *bitmap_file, int bitmap_chunk, int write_behind,
           int delay, int autof)
 {
@@ -958,7 +959,9 @@ int Create(struct supertype *st, char *mddev,
                        case LEVEL_MULTIPATH:
                        case 0:
                                err = sysfs_set_str(&info, NULL, "array_state",
-                                                   "active");
+                                                   readonly
+                                                   ? "readonly"
+                                                   : "active");
                                need_mdmon = 0;
                                break;
                        default:
@@ -973,12 +976,22 @@ int Create(struct supertype *st, char *mddev,
                                ioctl(mdfd, STOP_ARRAY, NULL);
                                goto abort;
                        }
+               } else if (readonly &&
+                          sysfs_attribute_available(
+                                  &info, NULL, "array_state")) {
+                       if (sysfs_set_str(&info, NULL,
+                                         "array_state", "readonly") < 0) {
+                               pr_err("Failed to start array: %s\n",
+                                      strerror(errno));
+                               ioctl(mdfd, STOP_ARRAY, NULL);
+                               goto abort;
+                       }
                } else {
                        /* param is not actually used */
                        mdu_param_t param;
                        if (ioctl(mdfd, RUN_ARRAY, &param)) {
                                pr_err("RUN_ARRAY failed: %s\n",
-                                       strerror(errno));
+                                      strerror(errno));
                                if (info.array.chunk_size & (info.array.chunk_size-1)) {
                                        cont_err("Problem may be that "
                                                 "chunk size is not a power of 2\n");
diff --git a/mdadm.c b/mdadm.c
index e10fc38d72fff03c13e698908f351c46e82af269..5aa0823f01488949ecba5ccc83657e8466200e2b 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -1373,7 +1373,8 @@ int main(int argc, char *argv[])
                rv = Create(ss, devlist->devname, chunk, level, layout, size<0 ? 0 : size,
                            raiddisks, sparedisks, ident.name, homehost,
                            ident.uuid_set ? ident.uuid : NULL,
-                           devs_found-1, devlist->next, runstop, verbose-quiet, force, assume_clean,
+                           devs_found-1, devlist->next, runstop,
+                           readonly, verbose-quiet, force, assume_clean,
                            bitmap_file, bitmap_chunk, write_behind, delay, autof);
                break;
        case MISC:
diff --git a/mdadm.h b/mdadm.h
index f96ac7b1855dce5ee3d5c01477f5a8c61db49d2c..564b5105c186da5dde80bde0169bf0dc4256b8d0 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -1085,10 +1085,12 @@ extern int Build(char *mddev, int chunk, int level, int layout,
 
 
 extern int Create(struct supertype *st, char *mddev,
-                 int chunk, int level, int layout, unsigned long long size, int raiddisks, int sparedisks,
+                 int chunk, int level, int layout, unsigned long long size,
+                 int raiddisks, int sparedisks,
                  char *name, char *homehost, int *uuid,
                  int subdevs, struct mddev_dev *devlist,
-                 int runstop, int verbose, int force, int assume_clean,
+                 int runstop, int readonly, int verbose,
+                 int force, int assume_clean,
                  char *bitmap_file, int bitmap_chunk, int write_behind, int delay, int autof);
 
 extern int Detail(char *dev, int brief, int export, int test, char *homehost, char *prefer);