pool/mdadm
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Assemble-Incremental-don-t-hold-O_EXCL-on-mddev-afte.patch

Browse Source 
Ensure fsck/mount don't find an md array to be BUSY
  the moment it appears.
- mkinitrd-setup.sh: Make the array device names in
  /etc/mdadm.conf in the initrd match those in /etc/mdadm.conf
  in the root filesystem.  (bnc#851993)

OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=99
This commit is contained in:
Neil Brown 2013-12-04 23:59:54 +00:00 committed by Git OBS Bridge
parent b646ad77a6
commit 976798c0df
4 changed files with 110 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
Assemble-Incremental-don-t-hold-O_EXCL-on-mddev-afte.patch Normal file
View File

@ -0,0 +1,88 @@
From 8832342d3aad09d3c86af6dc9b137d6fd83af1ae Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Thu, 5 Dec 2013 10:35:16 +1100
Subject: [PATCH] Assemble/Incremental: don't hold O_EXCL on mddev after
assembly.
As soon as the array is assembled, udev or systemd might run
fsck and mount it. So we need to drop O_EXCL promptly.
Signed-off-by: NeilBrown <neilb@suse.de>
---
Assemble.c | 1 +
Incremental.c | 10 +++++++---
mdadm.h | 1 +
util.c | 14 ++++++++++++++
4 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/Assemble.c b/Assemble.c
index 44e905bb8667..7e8e79570352 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -1037,6 +1037,7 @@ static int start_array(int mdfd,
} else
#endif
rv = ioctl(mdfd, RUN_ARRAY, NULL);
+ reopen_mddev(mdfd); /* drop O_EXCL */
if (rv == 0) {
if (c->verbose >= 0) {
pr_err("%s has been started with %d drive%s",
diff --git a/Incremental.c b/Incremental.c
index f548bad9785d..c9372587f518 100644
--- a/Incremental.c
+++ b/Incremental.c
@@ -588,10 +588,14 @@ int Incremental(struct mddev_dev *devlist, struct context *c,
else
rv = sysfs_set_str(sra, NULL,
"array_state", "read-auto");
+ /* Array might be O_EXCL which will interfere with
+ * fsck and mount. So re-open without O_EXCL.
+ */
+ reopen_mddev(mdfd);
if (rv == 0) {
- if (c->export) {
- printf("MD_STARTED=yes\n");
- } else if (c->verbose >= 0)
+ if (c->export) {
+ printf("MD_STARTED=yes\n");
+ } else if (c->verbose >= 0)
pr_err("%s attached to %s, which has been started.\n",
devname, chosen_name);
rv = 0;
diff --git a/mdadm.h b/mdadm.h
index 69facaf32956..7f222a6d7a78 100644
--- a/mdadm.h
+++ b/mdadm.h
@@ -1272,6 +1272,7 @@ extern int check_partitions(int fd, char *dname,
extern int get_mdp_major(void);
extern int dev_open(char *dev, int flags);
extern int open_dev(char *devnm);
+extern void reopen_mddev(int mdfd);
extern int open_dev_flags(char *devnm, int flags);
extern int open_dev_excl(char *devnm);
extern int is_standard(char *dev, int *nump);
diff --git a/util.c b/util.c
index 12a19e7a5a3a..e32d97a011e7 100644
--- a/util.c
+++ b/util.c
@@ -1950,3 +1950,17 @@ int in_initrd(void)
((unsigned long)s.f_type == TMPFS_MAGIC ||
(unsigned long)s.f_type == RAMFS_MAGIC);
}
+
+void reopen_mddev(int mdfd)
+{
+ /* Re-open without any O_EXCL, but keep
+ * the same fd
+ */
+ char *devnm;
+ int fd;
+ devnm = fd2devnm(mdfd);
+ close(mdfd);
+ fd = open_dev(devnm);
+ if (fd >= 0 && fd != mdfd)
+ dup2(fd, mdfd);
+}
--
1.8.3.1.487.g3e7a5b4

10
mdadm.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Dec 4 23:57:16 UTC 2013 - nfbrown@suse.com
- Assemble-Incremental-don-t-hold-O_EXCL-on-mddev-afte.patch
Ensure fsck/mount don't find an md array to be BUSY
the moment it appears.
- mkinitrd-setup.sh: Make the array device names in
/etc/mdadm.conf in the initrd match those in /etc/mdadm.conf
in the root filesystem. (bnc#851993)
-------------------------------------------------------------------
Tue Dec 3 03:06:07 UTC 2013 - nfbrown@suse.com

3
mdadm.spec
View File

@ -77,6 +77,8 @@ Patch14: Incremental-add-export-handling.patch
Patch15: udev-rules.degraded
# PATCH-FEATURE-UPSTREAM Incremental-improve-support-for-DEVICE-based-restric.patch bnc#851993 nfbrown@suse.de
Patch16: Incremental-improve-support-for-DEVICE-based-restric.patch
# PATCH-FIX-UPSTREAM Assemble-Incremental-don-t-hold-O_EXCL-on-mddev-afte.patch nfbrown@suse.de
Patch17: Assemble-Incremental-don-t-hold-O_EXCL-on-mddev-afte.patch
%define _udevdir %(pkg-config --variable=udevdir udev)
%define _systemdshutdowndir %{_unitdir}/../system-shutdown
@ -104,6 +106,7 @@ programs but with a very different interface.
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
%build
make %{?_smp_mflags} CC="%__cc" CXFLAGS="$RPM_OPT_FLAGS -Wno-error"

9
mkinitrd-setup.sh
View File

@ -81,6 +81,15 @@ for bd in $blockdev ; do
echo "unrecognized container for $md_dev: $container"
;;
esac
# If /etc/mdadm.conf contains a different name for this
# array, then use that.
md_uuid=`echo $mdconf | sed -n -e 's/.* UUID=\([0-9a-f:]*\).*/\1/p'`
if [ -f /etc/mdadm.conf -a -n "$md_uuid" ]; then
md_devname=`sed -n -e 's,^ARRAY */dev/\([^ ]*\) .*[Uu][Uu][Ii][Dd]='$md_uuid'.*,\1,p' /etc/mdadm.conf`
if [ -n "$md_devname" ]; then
mdconf=`echo $mdconf | sed -e 's,^ARRAY /dev/\([^ ]*\),ARRAY /dev/'$md_devname','`
fi
fi
md_conf["$md_dev"]="$mdconf"
root_md=1
done