Merge branch 'master' into devel-3.0

[thirdparty/mdadm.git] / Kill.c

diff --git a/Kill.c b/Kill.c
index d5c1e36df4d3724e6cf060238902cb897e01bfed..96b270f278db10d6361a8c45d17798db75dd3068 100644 (file)
--- a/Kill.c
+++ b/Kill.c
@@ -44,7 +44,9 @@ int Kill(char *dev, int force, int quiet, int noexcl)
        int fd, rv = 0;
        struct supertype *st;
 
-       fd = open(dev, O_DIRECT | (noexcl ? O_RDWR : (O_RDWR|O_EXCL)));
+       if (force)
+               noexcl = 1;
+       fd = open(dev, O_RDWR|(force ? 0 : O_EXCL));
        if (fd < 0) {
                if (!quiet)
                        fprintf(stderr, Name ": Couldn't open %s for write - not zeroing\n",