From 4dec24f15c76fd815539b4a6408264e50aab34e3 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 1 Apr 2010 10:53:41 +0000 Subject: [PATCH] Fixed two more compiler warnings. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1576 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/config.c | 2 +- scst/src/dev_handlers/scst_vdisk.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/iscsi-scst/kernel/config.c b/iscsi-scst/kernel/config.c index c94017413..28a16cab4 100644 --- a/iscsi-scst/kernel/config.c +++ b/iscsi-scst/kernel/config.c @@ -695,7 +695,7 @@ int iscsi_add_attr(struct iscsi_target *target, tgt_attr = kzalloc(sizeof(*tgt_attr), GFP_KERNEL); if (tgt_attr == NULL) { - PRINT_ERROR("Unable to allocate user (size %d)", + PRINT_ERROR("Unable to allocate user (size %zd)", sizeof(*tgt_attr)); res = -ENOMEM; goto out; diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index 5e515cb14..a591cafaf 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -294,7 +294,7 @@ static ssize_t vdisk_add_blockio_device(const char *device_name, char *params); static ssize_t vdisk_add_nullio_device(const char *device_name, char *params); static ssize_t vdisk_del_device(const char *device_name); static ssize_t vcdrom_add_device(const char *device_name, char *params); -static int vcdrom_del_device(const char *device_name); +static ssize_t vcdrom_del_device(const char *device_name); #endif static int vdisk_task_mgmt_fn(struct scst_mgmt_cmd *mcmd, struct scst_tgt_dev *tgt_dev); @@ -3496,7 +3496,7 @@ out: } -static int vcdrom_del_device(const char *device_name) +static ssize_t vcdrom_del_device(const char *device_name) { int res = 0; struct scst_vdisk_dev *virt_dev;