Commit 799ae31c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Miquel Raynal
Browse files

mtd_blkdevs: don't hold del_mtd_blktrans_dev in blktrans_{open, release} 



There is nothing that this protects against except for slightly reducing
the window when new opens can appear just before calling del_gendisk.

Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20210823073359.705281-2-hch@lst.de
parent a89d69a4

drivers/mtd/mtd_blkdevs.c

+0 −5
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode) 
	if (!dev)

		return -ERESTARTSYS; /* FIXME: busy loop! -arnd*/



	mutex_lock(&mtd_table_mutex);

	mutex_lock(&dev->lock);



	if (dev->open)
@@ -233,7 +232,6 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode) 
unlock:

	dev->open++;

	mutex_unlock(&dev->lock);

	mutex_unlock(&mtd_table_mutex);

	blktrans_dev_put(dev);

	return ret;
@@ -244,7 +242,6 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode) 
	module_put(dev->tr->owner);

	kref_put(&dev->ref, blktrans_dev_release);

	mutex_unlock(&dev->lock);

	mutex_unlock(&mtd_table_mutex);

	blktrans_dev_put(dev);

	return ret;

}
@@ -256,7 +253,6 @@ static void blktrans_release(struct gendisk *disk, fmode_t mode) 
	if (!dev)

		return;



	mutex_lock(&mtd_table_mutex);

	mutex_lock(&dev->lock);



	if (--dev->open)
@@ -272,7 +268,6 @@ static void blktrans_release(struct gendisk *disk, fmode_t mode) 
	}

unlock:

	mutex_unlock(&dev->lock);

	mutex_unlock(&mtd_table_mutex);

	blktrans_dev_put(dev);

}