From 85124b774dce6fd944bfb03a5c99617b78f06fa3 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Thu, 8 Dec 2011 15:49:12 +1100
Subject: [PATCH] --- yaml --- r: 276585 b: refs/heads/master c:
 1d23f178d56ae1349b4fc5108ac8f4f8cdc92afc h: refs/heads/master i:   276583:
 318c325e91cb84b2e80d95a17a23460a0af1b2a0 v: v3

---
 [refs]                | 2 +-
 trunk/drivers/md/md.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8eb45d80dbdd..6d303f49d4d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c8f4247986bb5c5fb1d5b1fad35461989fe8310
+refs/heads/master: 1d23f178d56ae1349b4fc5108ac8f4f8cdc92afc
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
index 84acfe7d10e4..93b0da133507 100644
--- a/trunk/drivers/md/md.c
+++ b/trunk/drivers/md/md.c
@@ -3788,6 +3788,8 @@ array_state_store(struct mddev *mddev, const char *buf, size_t len)
 	if (err)
 		return err;
 	else {
+		if (mddev->hold_active == UNTIL_IOCTL)
+			mddev->hold_active = 0;
 		sysfs_notify_dirent_safe(mddev->sysfs_state);
 		return len;
 	}
@@ -4508,8 +4510,6 @@ md_attr_store(struct kobject *kobj, struct attribute *attr,
 	if (!capable(CAP_SYS_ADMIN))
 		return -EACCES;
 	rv = mddev_lock(mddev);
-	if (mddev->hold_active == UNTIL_IOCTL)
-		mddev->hold_active = 0;
 	if (!rv) {
 		rv = entry->store(mddev, page, length);
 		mddev_unlock(mddev);