loop: use set_disk_ro

[linux-2.6-microblaze.git] / drivers / block / loop.c

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index cb1191d..027f572 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -255,7 +255,8 @@ static void loop_set_size(struct loop_device *lo, loff_t size)
 
        bd_set_nr_sectors(bdev, size);
 
-       set_capacity_revalidate_and_notify(lo->lo_disk, size, false);
+       if (!set_capacity_revalidate_and_notify(lo->lo_disk, size, false))
+               kobject_uevent(&disk_to_dev(bdev->bd_disk)->kobj, KOBJ_CHANGE);
 }
 
 static inline int
@@ -1137,7 +1138,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
        if (error)
                goto out_unlock;
 
-       set_device_ro(bdev, (lo->lo_flags & LO_FLAGS_READ_ONLY) != 0);
+       set_disk_ro(lo->lo_disk, (lo->lo_flags & LO_FLAGS_READ_ONLY) != 0);
 
        lo->use_dio = lo->lo_flags & LO_FLAGS_DIRECT_IO;
        lo->lo_device = bdev;