UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mtip32xx: fix a smatch warning 

Reported smatch warning:
drivers/block/mtip32xx/mtip32xx.c:4163 mtip_block_shutdown() warn: variable dereferenced before check 'dd->disk' (see line 4159)

dd->disk->disk_name accessed before the check if dd->disk is NULL. Fixed this
and access of dd->queue/dd->disk->queue.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Asai Thambi S P <asamymuthupa@micron.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Asai Thambi S P 2013-04-12 23:57:17 +05:30 committed by Jens Axboe
parent cef5279735
commit 5a79e1ac21
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/block/mtip32xx/mtip32xx.c
View File

@ -4053,26 +4053,24 @@ static int mtip_block_remove(struct driver_data *dd)
*/ */
static int mtip_block_shutdown(struct driver_data *dd) static int mtip_block_shutdown(struct driver_data *dd)
{ {
dev_info(&dd->pdev->dev,
"Shutting down %s ...\n", dd->disk->disk_name);
/* Delete our gendisk structure, and cleanup the blk queue. */ /* Delete our gendisk structure, and cleanup the blk queue. */
if (dd->disk) { if (dd->disk) {
if (dd->disk->queue) dev_info(&dd->pdev->dev,
del_gendisk(dd->disk); "Shutting down %s ...\n", dd->disk->disk_name);
else
put_disk(dd->disk);
}
if (dd->disk->queue) {
del_gendisk(dd->disk);
blk_cleanup_queue(dd->queue);
} else
put_disk(dd->disk);
dd->disk = NULL;
dd->queue = NULL;
}
spin_lock(&rssd_index_lock); spin_lock(&rssd_index_lock);
ida_remove(&rssd_index_ida, dd->index); ida_remove(&rssd_index_ida, dd->index);
spin_unlock(&rssd_index_lock); spin_unlock(&rssd_index_lock);
blk_cleanup_queue(dd->queue);
dd->disk = NULL;
dd->queue = NULL;
mtip_hw_shutdown(dd); mtip_hw_shutdown(dd);
return 0; return 0;
} }