lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] osd: checking NULL instead of ERR_PTR()

Browse Source 
bio_map_kern() returns ERR_PTRs on failure and never returns NULL.

[jejb: remove redundant unlikely spotted by Tobias Klauser]
Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Dan Carpenter
2010-11-12 07:31:46 +03:00
committed by James Bottomley
parent 6313e3c217
commit 057f02a38e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/scsi/osd/osd_initiator.c
View File

@@ -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 */ /* create a bio for continuation segment */
bio = bio_map_kern(req_q, or->cdb_cont.buff, or->cdb_cont.total_bytes, bio = bio_map_kern(req_q, or->cdb_cont.buff, or->cdb_cont.total_bytes,
GFP_KERNEL); GFP_KERNEL);
if (unlikely(!bio)) if (IS_ERR(bio))
return -ENOMEM; return PTR_ERR(bio);
bio->bi_rw |= REQ_WRITE; bio->bi_rw |= REQ_WRITE;