diff options
| author | Dan Carpenter <error27@gmail.com> | 2011-02-09 15:34:36 -0800 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2011-02-12 11:29:07 -0600 |
| commit | 3ae279d25954de47c704ca713a2711ac10fcd1ee (patch) | |
| tree | cb5b7976ad78d86c761a8e66e9c13cd718c03937 /drivers/target | |
| parent | a361cc0025614fdd07f5f69aeeaa8075530870bc (diff) | |
| download | linux-3.10-3ae279d25954de47c704ca713a2711ac10fcd1ee.tar.gz linux-3.10-3ae279d25954de47c704ca713a2711ac10fcd1ee.tar.bz2 linux-3.10-3ae279d25954de47c704ca713a2711ac10fcd1ee.zip | |
[SCSI] target: iblock/pscsi claim checking for NULL instead of IS_ERR
blkdev_get_by_path() returns an ERR_PTR() or error and it doesn't return
a NULL. It looks like this bug would be easy to trigger by mistake.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/target')
| -rw-r--r-- | drivers/target/target_core_iblock.c | 2 | ||||
| -rw-r--r-- | drivers/target/target_core_pscsi.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c index c6e0d757e76..34561350d5e 100644 --- a/drivers/target/target_core_iblock.c +++ b/drivers/target/target_core_iblock.c @@ -154,7 +154,7 @@ static struct se_device *iblock_create_virtdevice( bd = blkdev_get_by_path(ib_dev->ibd_udev_path, FMODE_WRITE|FMODE_READ|FMODE_EXCL, ib_dev); - if (!(bd)) + if (IS_ERR(bd)) goto failed; /* * Setup the local scope queue_limits from struct request_queue->limits diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c index 742d24609a9..f2a08477a68 100644 --- a/drivers/target/target_core_pscsi.c +++ b/drivers/target/target_core_pscsi.c @@ -462,8 +462,8 @@ static struct se_device *pscsi_create_type_disk( */ bd = blkdev_get_by_path(se_dev->se_dev_udev_path, FMODE_WRITE|FMODE_READ|FMODE_EXCL, pdv); - if (!(bd)) { - printk("pSCSI: blkdev_get_by_path() failed\n"); + if (IS_ERR(bd)) { + printk(KERN_ERR "pSCSI: blkdev_get_by_path() failed\n"); scsi_device_put(sd); return NULL; } |