From 1b88dc8115639b43cd7523e1bc4bed503f45608f Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 28 Jul 2009 09:13:13 +0200
Subject: [PATCH] --- yaml --- r: 161204 b: refs/heads/master c:
 e3264a4d7de147677f1995f119eba05c9abe9c1c h: refs/heads/master v: v3

---
 [refs]              |  2 +-
 trunk/block/genhd.c | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a5db910e33f9..1ec8a74cf97d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d58b85e1e891cd842d6e183f5d94d06a4fd0122c
+refs/heads/master: e3264a4d7de147677f1995f119eba05c9abe9c1c
diff --git a/trunk/block/genhd.c b/trunk/block/genhd.c
index f4c64c2b303a..b89328eceee2 100644
--- a/trunk/block/genhd.c
+++ b/trunk/block/genhd.c
@@ -1215,6 +1215,16 @@ void put_disk(struct gendisk *disk)
 
 EXPORT_SYMBOL(put_disk);
 
+static void set_disk_ro_uevent(struct gendisk *gd, int ro)
+{
+	char event[] = "DISK_RO=1";
+	char *envp[] = { event, NULL };
+
+	if (!ro)
+		event[8] = '0';
+	kobject_uevent_env(&disk_to_dev(gd)->kobj, KOBJ_CHANGE, envp);
+}
+
 void set_device_ro(struct block_device *bdev, int flag)
 {
 	bdev->bd_part->policy = flag;
@@ -1227,8 +1237,12 @@ void set_disk_ro(struct gendisk *disk, int flag)
 	struct disk_part_iter piter;
 	struct hd_struct *part;
 
-	disk_part_iter_init(&piter, disk,
-			    DISK_PITER_INCL_EMPTY | DISK_PITER_INCL_PART0);
+	if (disk->part0.policy != flag) {
+		set_disk_ro_uevent(disk, flag);
+		disk->part0.policy = flag;
+	}
+
+	disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY);
 	while ((part = disk_part_iter_next(&piter)))
 		part->policy = flag;
 	disk_part_iter_exit(&piter);