scst_lib, scst_vdisk: Remove unlikely from IS_ERR_OR_NULL

This patch fixes the following checkpatch warnings:

    WARNING:LIKELY_MISUSE: nested (un)?likely() calls,
    IS_ERR_OR_NULL already uses unlikely() internally.
This commit is contained in:
Gleb Chesnokov
2022-07-28 19:54:43 +03:00
committed by Gleb Chesnokov
parent b4e09bac10
commit d94c7fb06e
2 changed files with 2 additions and 2 deletions

View File

@@ -5845,7 +5845,7 @@ static void vdisk_blk_add_dif(struct bio *bio, gfp_t gfp_mask,
}
bip = bio_integrity_alloc(bio, gfp_mask, pages);
if (unlikely(IS_ERR_OR_NULL(bip))) {
if (IS_ERR_OR_NULL(bip)) {
PRINT_WARNING("Allocation of %d pages for DIF tags "
"failed! (dev %s)", pages, dev->virt_name);
goto out; /* proceed without integrity */

View File

@@ -8308,7 +8308,7 @@ static struct request *blk_map_kern_sg(struct request_queue *q,
if (!sgl) {
rq = scst_alloc_passthrough_request(q, reading ? READ : WRITE,
gfp);
if (unlikely(IS_ERR_OR_NULL(rq)))
if (IS_ERR_OR_NULL(rq))
return ERR_PTR(-ENOMEM);
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)