tcm_vhost: Fix incorrect IS_ERR() usage in vhost_scsi_map_iov_to_sgl
authorFengguang Wu <fengguang.wu@intel.com>
Mon, 30 Jul 2012 20:19:07 +0000 (13:19 -0700)
committerNicholas Bellinger <nab@linux-iscsi.org>
Fri, 17 Aug 2012 00:33:28 +0000 (17:33 -0700)
Fix up a new coccinelle warnings reported by Fengguang Wu + Intel
0-DAY kernel build testing backend:

drivers/vhost/tcm_vhost.c:537:23-29: ERROR: allocation function on line
533 returns NULL not ERR_PTR on failure

vim +537 drivers/vhost/tcm_vhost.c
   534          if (!sg)
   535                  return -ENOMEM;
   536          pr_debug("%s sg %p sgl_count %u is_err %ld\n", __func__,
 > 537                 sg, sgl_count, IS_ERR(sg));
   538          sg_init_table(sg, sgl_count);
   539
   540          tv_cmd->tvc_sgl = sg;

Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
drivers/vhost/tcm_vhost.c

index fb36654..481af88 100644 (file)
@@ -533,8 +533,8 @@ static int vhost_scsi_map_iov_to_sgl(struct tcm_vhost_cmd *tv_cmd,
        sg = kmalloc(sizeof(tv_cmd->tvc_sgl[0]) * sgl_count, GFP_ATOMIC);
        if (!sg)
                return -ENOMEM;
-       pr_debug("%s sg %p sgl_count %u is_err %ld\n", __func__,
-              sg, sgl_count, IS_ERR(sg));
+       pr_debug("%s sg %p sgl_count %u is_err %d\n", __func__,
+              sg, sgl_count, !sg);
        sg_init_table(sg, sgl_count);
 
        tv_cmd->tvc_sgl = sg;