From mboxrd@z Thu Jan  1 00:00:00 1970
From: Boaz Harrosh <bharrosh@panasas.com>
Date: Sun, 14 Nov 2010 13:39:53 +0000
Subject: Re: [patch] scsi/osd: checking NULL instead of ERR_PTR()
Message-Id: <4CDFE6A9.10704@panasas.com>
List-Id: <kernel-janitors.vger.kernel.org>
References: <20101112043146.GC3533@bicker>
In-Reply-To: <20101112043146.GC3533@bicker>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: Dan Carpenter <error27@gmail.com>, "James E.J. Bottomley" <James.Bottomley@suse.de>
Cc: Benny Halevy <bhalevy@panasas.com>, osd-dev@open-osd.org, linux-scsi@vger.kernel.org, kernel-janitors@vger.kernel.org

On 11/12/2010 06:31 AM, Dan Carpenter wrote:
> bio_map_kern() returns ERR_PTRs on failure and never returns NULL.
> 
> Signed-off-by: Dan Carpenter <error27@gmail.com>
> 

Acked-by: Boaz Harrosh <bharrosh@panasas.com>

> diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c
> index 0433ea6..b798919 100644
> --- a/drivers/scsi/osd/osd_initiator.c
> +++ b/drivers/scsi/osd/osd_initiator.c
> @@ -951,8 +951,8 @@ static int _osd_req_finalize_cdb_cont(struct osd_request *or, const u8 *cap_key)
>  	/* create a bio for continuation segment */
>  	bio = bio_map_kern(req_q, or->cdb_cont.buff, or->cdb_cont.total_bytes,
>  			   GFP_KERNEL);
> -	if (unlikely(!bio))
> -		return -ENOMEM;
> +	if (unlikely(IS_ERR(bio)))
> +		return PTR_ERR(bio);
>  
>  	bio->bi_rw |= REQ_WRITE;
>  

Wahoo, good catch, thanks! This is new code in 2.6.37-rc1. It should be pushed
for current Kernel.

James: please apply to scsi-rc-fixes for the next round of fixes?

Thanks
Boaz