From 3ddf750f514d18a71c9de5ccfe73d6b60dad3689 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Fri, 5 Dec 2014 12:59:32 +0000 Subject: [PATCH] scst: Remove unused variables (merge r5585 from trunk) git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@5926 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/dev_handlers/scst_vdisk.c | 3 +-- scst/src/scst_lib.c | 5 ----- scst/src/scst_pres.c | 7 ++++--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index a5d7726c5..8aa6576dc 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -4887,7 +4887,7 @@ static enum compl_status_e fileio_exec_write(struct vdisk_cmd_params *p) loff_t loff = p->loff; mm_segment_t old_fs; loff_t err = 0; - ssize_t length, full_len, saved_full_len; + ssize_t length, full_len; uint8_t __user *address; struct scst_vdisk_dev *virt_dev = cmd->dev->dh_priv; struct file *fd = virt_dev->fd; @@ -4943,7 +4943,6 @@ static enum compl_status_e fileio_exec_write(struct vdisk_cmd_params *p) goto out_set_fs; } - saved_full_len = full_len; eiv = iv; eiv_count = iv_count; restart: diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index 2ea34d7c9..44132e9e8 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -9042,16 +9042,11 @@ static void scst_process_qerr(struct scst_cmd *cmd) int scst_process_check_condition(struct scst_cmd *cmd) { int res; - struct scst_order_data *order_data; - struct scst_device *dev; TRACE_ENTRY(); EXTRACHECKS_BUG_ON(test_bit(SCST_CMD_NO_RESP, &cmd->cmd_flags)); - order_data = cmd->cur_order_data; - dev = cmd->dev; - TRACE_DBG("CHECK CONDITION for cmd %p (tgt_dev %p)", cmd, cmd->tgt_dev); scst_process_qerr(cmd); diff --git a/scst/src/scst_pres.c b/scst/src/scst_pres.c index f5995e210..cc06ac361 100644 --- a/scst/src/scst_pres.c +++ b/scst/src/scst_pres.c @@ -858,15 +858,16 @@ out: static void scst_pr_remove_device_files(struct scst_tgt_dev *tgt_dev) { - int res = 0; struct scst_device *dev = tgt_dev->dev; TRACE_ENTRY(); scst_assert_pr_mutex_held(dev); - res = dev->pr_file_name ? scst_remove_file(dev->pr_file_name) : -ENOENT; - res = dev->pr_file_name1 ? scst_remove_file(dev->pr_file_name1) : -ENOENT; + if (dev->pr_file_name) + scst_remove_file(dev->pr_file_name); + if (dev->pr_file_name1) + scst_remove_file(dev->pr_file_name1); TRACE_EXIT(); return;