loop: Properly clear sysfs in autoclear mode
authorMilan Broz <mbroz@redhat.com>
Thu, 28 Oct 2010 01:51:30 +0000 (19:51 -0600)
committerJens Axboe <jaxboe@fusionio.com>
Thu, 28 Oct 2010 01:51:30 +0000 (19:51 -0600)
In autoclear mode bdev is NULL but the sysfs
entry should be destroyed otherwise this warning appears:

WARNING: at fs/sysfs/dir.c:451 sysfs_add_one+0x82/0x95()
sysfs: cannot create duplicate filename '/devices/virtual/block/loop0/loop'

Fixes commit ee86273062cbb310665fe49e1f1937d2cf85b0b9

Signed-off-by: Milan Broz <mbroz@redhat.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
drivers/block/loop.c

index 450c958b514fea941e5f11de2b248dec6e7477c0..1e5284ef65fa47313d4a6609526b6dfecf00615e 100644 (file)
@@ -1049,9 +1049,9 @@ static int loop_clr_fd(struct loop_device *lo, struct block_device *bdev)
        if (bdev)
                invalidate_bdev(bdev);
        set_capacity(lo->lo_disk, 0);
+       loop_sysfs_exit(lo);
        if (bdev) {
                bd_set_size(bdev, 0);
-               loop_sysfs_exit(lo);
                /* let user-space know about this change */
                kobject_uevent(&disk_to_dev(bdev->bd_disk)->kobj, KOBJ_CHANGE);
        }