Skip to content

Commit ee28b42

Browse files
Christoph Hellwigmiquelraynal
authored andcommitted
mtd_blkdevs: simplify the refcounting in blktrans_{open, release}
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 <[email protected]> Signed-off-by: Miquel Raynal <[email protected]> Link: https://lore.kernel.org/linux-mtd/[email protected]
1 parent 37b143d commit ee28b42

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

drivers/mtd/mtd_blkdevs.c

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,6 @@ static void blktrans_dev_release(struct kref *kref)
3636
kfree(dev);
3737
}
3838

39-
static struct mtd_blktrans_dev *blktrans_dev_get(struct gendisk *disk)
40-
{
41-
struct mtd_blktrans_dev *dev = disk->private_data;
42-
43-
kref_get(&dev->ref);
44-
return dev;
45-
}
46-
4739
static void blktrans_dev_put(struct mtd_blktrans_dev *dev)
4840
{
4941
kref_put(&dev->ref, blktrans_dev_release);
@@ -191,15 +183,16 @@ static blk_status_t mtd_queue_rq(struct blk_mq_hw_ctx *hctx,
191183

192184
static int blktrans_open(struct block_device *bdev, fmode_t mode)
193185
{
194-
struct mtd_blktrans_dev *dev = blktrans_dev_get(bdev->bd_disk);
186+
struct mtd_blktrans_dev *dev = bdev->bd_disk->private_data;
195187
int ret = 0;
196188

189+
kref_get(&dev->ref);
190+
197191
mutex_lock(&dev->lock);
198192

199193
if (dev->open)
200194
goto unlock;
201195

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

205198
if (!dev->mtd)
@@ -219,30 +212,27 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode)
219212
unlock:
220213
dev->open++;
221214
mutex_unlock(&dev->lock);
222-
blktrans_dev_put(dev);
223215
return ret;
224216

225217
error_release:
226218
if (dev->tr->release)
227219
dev->tr->release(dev);
228220
error_put:
229221
module_put(dev->tr->owner);
230-
kref_put(&dev->ref, blktrans_dev_release);
231222
mutex_unlock(&dev->lock);
232223
blktrans_dev_put(dev);
233224
return ret;
234225
}
235226

236227
static void blktrans_release(struct gendisk *disk, fmode_t mode)
237228
{
238-
struct mtd_blktrans_dev *dev = blktrans_dev_get(disk);
229+
struct mtd_blktrans_dev *dev = disk->private_data;
239230

240231
mutex_lock(&dev->lock);
241232

242233
if (--dev->open)
243234
goto unlock;
244235

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

248238
if (dev->mtd) {

0 commit comments

Comments
 (0)