Skip to content

Commit

Permalink
mtd_blkdevs: simplify the refcounting in blktrans_{open, release}
Browse files Browse the repository at this point in the history
Always grab a reference to the mtd_blktrans_dev in ->open instead of
just on the first open, and do away with the additional temporary
references in ->open and ->release.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20210823073359.705281-9-hch@lst.de
  • Loading branch information
Christoph Hellwig authored and Miquel Raynal committed Aug 23, 2021
1 parent 37b143d commit ee28b42
Showing 1 changed file with 4 additions and 14 deletions.
18 changes: 4 additions & 14 deletions drivers/mtd/mtd_blkdevs.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,6 @@ static void blktrans_dev_release(struct kref *kref)
kfree(dev);
}

static struct mtd_blktrans_dev *blktrans_dev_get(struct gendisk *disk)
{
struct mtd_blktrans_dev *dev = disk->private_data;

kref_get(&dev->ref);
return dev;
}

static void blktrans_dev_put(struct mtd_blktrans_dev *dev)
{
kref_put(&dev->ref, blktrans_dev_release);
Expand Down Expand Up @@ -191,15 +183,16 @@ static blk_status_t mtd_queue_rq(struct blk_mq_hw_ctx *hctx,

static int blktrans_open(struct block_device *bdev, fmode_t mode)
{
struct mtd_blktrans_dev *dev = blktrans_dev_get(bdev->bd_disk);
struct mtd_blktrans_dev *dev = bdev->bd_disk->private_data;
int ret = 0;

kref_get(&dev->ref);

mutex_lock(&dev->lock);

if (dev->open)
goto unlock;

kref_get(&dev->ref);
__module_get(dev->tr->owner);

if (!dev->mtd)
Expand All @@ -219,30 +212,27 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode)
unlock:
dev->open++;
mutex_unlock(&dev->lock);
blktrans_dev_put(dev);
return ret;

error_release:
if (dev->tr->release)
dev->tr->release(dev);
error_put:
module_put(dev->tr->owner);
kref_put(&dev->ref, blktrans_dev_release);
mutex_unlock(&dev->lock);
blktrans_dev_put(dev);
return ret;
}

static void blktrans_release(struct gendisk *disk, fmode_t mode)
{
struct mtd_blktrans_dev *dev = blktrans_dev_get(disk);
struct mtd_blktrans_dev *dev = disk->private_data;

mutex_lock(&dev->lock);

if (--dev->open)
goto unlock;

kref_put(&dev->ref, blktrans_dev_release);
module_put(dev->tr->owner);

if (dev->mtd) {
Expand Down

0 comments on commit ee28b42

Please sign in to comment.