Re: [PATCH] libiscsi: avoid unnecessary multiple NULL assignments

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]


Replacing linux-scsi list with linux-kernel.

On Aug 12, 2012, at 9:15 AM, Masatake YAMATO <yamato@xxxxxxxxxx> wrote:

> In iscsi_free_task, NULL is assigned to task->sc twice: before and
> after kfifo_in invocatoin. Allocating and freeing iscsi_task are guarded
> with session->lock, so multiple NULL assignments cause no trouble. But
> people reading the source code may be confused.
> 
> The second NULL assignment comes from commit:
> 
>    3e5c28ad0391389959ccae81c938c7533efb3490
> 
> It seems that the line after kfifo_in invocation was introduced
> accidentally.
> 
> Signed-off-by: Masatake YAMATO <yamato@xxxxxxxxxx>
> ---
> drivers/scsi/libiscsi.c | 1 -
> 1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
> index 82c3fd4..7aacf3a 100644
> --- a/drivers/scsi/libiscsi.c
> +++ b/drivers/scsi/libiscsi.c
> @@ -500,21 +500,20 @@ static void iscsi_free_task(struct iscsi_task *task)
> 	task->sc = NULL;
> 	/*
> 	 * login task is preallocated so do not free
> 	 */
> 	if (conn->login_task == task)
> 		return;
> 
> 	kfifo_in(&session->cmdpool.queue, (void*)&task, sizeof(void*));
> 
> 	if (sc) {
> -		task->sc = NULL;
> 		/* SCSI eh reuses commands to verify us */
> 		sc->SCp.ptr = NULL;
> 		/*
> 		 * queue command may call this to free the task, so
> 		 * it will decide how to return sc to scsi-ml.
> 		 */
> 		if (oldstate != ISCSI_TASK_REQUEUE_SCSIQ)
> 			sc->scsi_done(sc);
> 	}

Looks ok to me.

Reviewed-by: Mike Christie <michaelc@xxxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[SCSI Target Devel]     [Linux SCSI Target Infrastructure]     [Kernel Newbies]     [Share Photos]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Photos]     [Yosemite]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Linux IIO]     [Samba]     [Video 4 Linux]     [Device Mapper]     [Linux Resources]

Add to Google Powered by Linux