Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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>

authored by

Dan Carpenter and committed by
James Bottomley
057f02a3 6313e3c2

+2 -2
+2 -2
drivers/scsi/osd/osd_initiator.c
··· 951 951 /* create a bio for continuation segment */ 952 952 bio = bio_map_kern(req_q, or->cdb_cont.buff, or->cdb_cont.total_bytes, 953 953 GFP_KERNEL); 954 - if (unlikely(!bio)) 955 - return -ENOMEM; 954 + if (IS_ERR(bio)) 955 + return PTR_ERR(bio); 956 956 957 957 bio->bi_rw |= REQ_WRITE; 958 958