---

yaml --- r: 276585 b: refs/heads/master c: 1d23f17 h: refs/heads/master i: 276583: 318c325 v: v3
git-mirror · Dec 8, 2011 · 85124b7 · 85124b7
1 parent b6ab3d8
commit 85124b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);