mdmon: fork and run as a daemon.

[thirdparty/mdadm.git] / Kill.c

diff --git a/Kill.c b/Kill.c
index a4d9562622d4dd2d2e4ce8e82e03312de67a77db..d5c1e36df4d3724e6cf060238902cb897e01bfed 100644 (file)
--- a/Kill.c
+++ b/Kill.c
@@ -1,7 +1,7 @@
 /*
  * mdadm - manage Linux "md" devices aka RAID arrays.
  *
- * Copyright (C) 2001-2002 Neil Brown <neilb@cse.unsw.edu.au>
+ * Copyright (C) 2001-2006 Neil Brown <neilb@suse.de>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
@@ -34,18 +34,17 @@
 #include       "md_u.h"
 #include       "md_p.h"
 
-int Kill(char *dev, int force, int quiet)
+int Kill(char *dev, int force, int quiet, int noexcl)
 {
        /*
         * Nothing fancy about Kill.  It just zeroes out a superblock
         * Definitely not safe.
         */
 
-       void *super;
        int fd, rv = 0;
        struct supertype *st;
-               
-       fd = open(dev, O_RDWR|O_EXCL);
+
+       fd = open(dev, O_DIRECT | (noexcl ? O_RDWR : (O_RDWR|O_EXCL)));
        if (fd < 0) {
                if (!quiet)
                        fprintf(stderr, Name ": Couldn't open %s for write - not zeroing\n",
@@ -60,15 +59,13 @@ int Kill(char *dev, int force, int quiet)
                close(fd);
                return 1;
        }
-       rv = st->ss->load_super(st, fd, &super, dev);
+       rv = st->ss->load_super(st, fd, dev);
        if (force && rv >= 2)
                rv = 0; /* ignore bad data in superblock */
        if (rv== 0 || (force && rv >= 2)) {
-               mdu_array_info_t info;
-               info.major_version = -1; /* zero superblock */
-               free(super);
-               st->ss->init_super(st, &super, &info, 0, "");
-               if (st->ss->store_super(st, fd, super)) {
+               st->ss->free_super(st);
+               st->ss->init_super(st, NULL, 0, "", NULL, NULL);
+               if (st->ss->store_super(st, fd)) {
                        if (!quiet)
                                fprintf(stderr, Name ": Could not zero superblock on %s\n",
                                        dev);