From 2650f9c1cf09e650f6e0dbce1d08047767b81850 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 23 Jul 2008 13:09:48 -0700 Subject: [PATCH] --- yaml --- r: 107395 b: refs/heads/master c: d8e64406a037a64444175730294e449c9e21f5ec h: refs/heads/master i: 107393: cbedb358f3ab1175770fb91a39dff95222c491d3 107391: 0b59a8025d40456caf66604b472b50b1b9d0dc86 v: v3 --- [refs] | 2 +- trunk/drivers/md/md.c | 5 ++++- trunk/include/linux/raid/md_k.h | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 468cc75de097..a72538b0e469 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2339788376e2d69a9154130e4dacd5b21ce63094 +refs/heads/master: d8e64406a037a64444175730294e449c9e21f5ec diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index c2ff77ccec50..0f1b83096425 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/drivers/md/md.c @@ -3483,7 +3483,7 @@ static void md_safemode_timeout(unsigned long data) if (!atomic_read(&mddev->writes_pending)) { mddev->safemode = 1; if (mddev->external) - sysfs_notify(&mddev->kobj, NULL, "array_state"); + set_bit(MD_NOTIFY_ARRAY_STATE, &mddev->flags); } md_wakeup_thread(mddev->thread); } @@ -6051,6 +6051,9 @@ void md_check_recovery(mddev_t *mddev) if (mddev->bitmap) bitmap_daemon_work(mddev->bitmap); + if (test_and_clear_bit(MD_NOTIFY_ARRAY_STATE, &mddev->flags)) + sysfs_notify(&mddev->kobj, NULL, "array_state"); + if (mddev->ro) return; diff --git a/trunk/include/linux/raid/md_k.h b/trunk/include/linux/raid/md_k.h index 9f2549ac0e2d..c200b9a34aff 100644 --- a/trunk/include/linux/raid/md_k.h +++ b/trunk/include/linux/raid/md_k.h @@ -128,6 +128,7 @@ struct mddev_s #define MD_CHANGE_DEVS 0 /* Some device status has changed */ #define MD_CHANGE_CLEAN 1 /* transition to or from 'clean' */ #define MD_CHANGE_PENDING 2 /* superblock update in progress */ +#define MD_NOTIFY_ARRAY_STATE 3 /* atomic context wants to notify userspace */ int ro;