From patchwork Mon Aug 10 06:12:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 52126 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by patches.linaro.org (Postfix) with ESMTPS id 152E020539 for ; Mon, 10 Aug 2015 06:14:10 +0000 (UTC) Received: by wicul11 with SMTP id ul11sf35417914wic.1 for ; Sun, 09 Aug 2015 23:14:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=U27sfd/egWDsQTHz256zvEOQuQn3e4VQBSbCnEvz4Jg=; b=KaIy3uwGcSa/gopenur0RxBaaEXW7BMvSf+4DwrJ+J3UxS/jHqSCo6dSsuHygmj+mf IyVy5sQJJtSE3EQ8ipoQHfS4FqrXBjjiXnjQJq1oJPGrCuwPYi01qVb45JYPLFoMsCot EjIyhulEOkDRpr3M+05yNaBJ/sIZguKkKtJCovh2AiZRLHvMnG0Z6EP9wVTMCekkxRvr UMKhVwJuTwkVZ2dKVbQviZlkNrO3Y0HHAbfbVHHmKeFWDVka3Bqv0vPPwWpFynRKK8lZ lpNIccP4Og/Us9659PRFac77265o3FWzi5QsPV3IZNyH9Io5MP978ZUYumToTX/JcLxJ D65A== X-Gm-Message-State: ALoCoQlry8MkRLyWqtEW5W5QBGS/j/o2b0WySVvYRNyhqcguudL8pK6vpm+NtULLYHjVokESr1MC X-Received: by 10.194.71.39 with SMTP id r7mr5814975wju.0.1439187249404; Sun, 09 Aug 2015 23:14:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.204.106 with SMTP id kx10ls27955lac.51.gmail; Sun, 09 Aug 2015 23:14:09 -0700 (PDT) X-Received: by 10.112.63.169 with SMTP id h9mr18786906lbs.104.1439187249206; Sun, 09 Aug 2015 23:14:09 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id wk8si13411348lbb.96.2015.08.09.23.14.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Aug 2015 23:14:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by labd1 with SMTP id d1so34555938lab.1 for ; Sun, 09 Aug 2015 23:14:09 -0700 (PDT) X-Received: by 10.112.176.228 with SMTP id cl4mr18860878lbc.106.1439187248922; Sun, 09 Aug 2015 23:14:08 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.7.198 with SMTP id l6csp1739361lba; Sun, 9 Aug 2015 23:14:07 -0700 (PDT) X-Received: by 10.70.140.238 with SMTP id rj14mr41690293pdb.38.1439187246961; Sun, 09 Aug 2015 23:14:06 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ih2si1798553pbb.76.2015.08.09.23.14.06; Sun, 09 Aug 2015 23:14:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753660AbbHJGOE (ORCPT + 28 others); Mon, 10 Aug 2015 02:14:04 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:33390 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753585AbbHJGOB (ORCPT ); Mon, 10 Aug 2015 02:14:01 -0400 Received: by pdrh1 with SMTP id h1so49701273pdr.0 for ; Sun, 09 Aug 2015 23:14:00 -0700 (PDT) X-Received: by 10.70.54.7 with SMTP id f7mr40559766pdp.75.1439187240607; Sun, 09 Aug 2015 23:14:00 -0700 (PDT) Received: from localhost ([223.227.137.11]) by smtp.gmail.com with ESMTPSA id t5sm2828626pdt.60.2015.08.09.23.13.57 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 09 Aug 2015 23:13:59 -0700 (PDT) From: Viresh Kumar To: akpm@linux-foundation.org Cc: linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, Viresh Kumar , Alasdair Kergon , dm-devel@redhat.com (maintainer:DEVICE-MAPPER (LVM)), linux-raid@vger.kernel.org (open list:SOFTWARE RAID (Multiple Disks) SUPPORT), Mike Snitzer , Neil Brown Subject: [PATCH V1 Resend 04/11] drivers: md: Drop unlikely before IS_ERR(_OR_NULL) Date: Mon, 10 Aug 2015 11:42:26 +0530 Message-Id: X-Mailer: git-send-email 2.4.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: viresh.kumar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there is no need to do that again from its callers. Drop it. Signed-off-by: Viresh Kumar --- drivers/md/dm-snap-persistent.c | 2 +- drivers/md/dm-verity.c | 2 +- drivers/md/persistent-data/dm-block-manager.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/md/dm-snap-persistent.c b/drivers/md/dm-snap-persistent.c index 808b8419bc48..bf71583296f7 100644 --- a/drivers/md/dm-snap-persistent.c +++ b/drivers/md/dm-snap-persistent.c @@ -533,7 +533,7 @@ static int read_exceptions(struct pstore *ps, chunk = area_location(ps, ps->current_area); area = dm_bufio_read(client, chunk, &bp); - if (unlikely(IS_ERR(area))) { + if (IS_ERR(area)) { r = PTR_ERR(area); goto ret_destroy_bufio; } diff --git a/drivers/md/dm-verity.c b/drivers/md/dm-verity.c index 4b34df8fdb58..d224979f9633 100644 --- a/drivers/md/dm-verity.c +++ b/drivers/md/dm-verity.c @@ -271,7 +271,7 @@ static int verity_verify_level(struct dm_verity_io *io, sector_t block, verity_hash_at_level(v, block, level, &hash_block, &offset); data = dm_bufio_read(v->bufio, hash_block, &buf); - if (unlikely(IS_ERR(data))) + if (IS_ERR(data)) return PTR_ERR(data); aux = dm_bufio_get_aux_data(buf); diff --git a/drivers/md/persistent-data/dm-block-manager.c b/drivers/md/persistent-data/dm-block-manager.c index 4d6c9b689eaa..88dbe7b97c2c 100644 --- a/drivers/md/persistent-data/dm-block-manager.c +++ b/drivers/md/persistent-data/dm-block-manager.c @@ -454,7 +454,7 @@ int dm_bm_read_lock(struct dm_block_manager *bm, dm_block_t b, int r; p = dm_bufio_read(bm->bufio, b, (struct dm_buffer **) result); - if (unlikely(IS_ERR(p))) + if (IS_ERR(p)) return PTR_ERR(p); aux = dm_bufio_get_aux_data(to_buffer(*result)); @@ -490,7 +490,7 @@ int dm_bm_write_lock(struct dm_block_manager *bm, return -EPERM; p = dm_bufio_read(bm->bufio, b, (struct dm_buffer **) result); - if (unlikely(IS_ERR(p))) + if (IS_ERR(p)) return PTR_ERR(p); aux = dm_bufio_get_aux_data(to_buffer(*result)); @@ -523,7 +523,7 @@ int dm_bm_read_try_lock(struct dm_block_manager *bm, int r; p = dm_bufio_get(bm->bufio, b, (struct dm_buffer **) result); - if (unlikely(IS_ERR(p))) + if (IS_ERR(p)) return PTR_ERR(p); if (unlikely(!p)) return -EWOULDBLOCK; @@ -559,7 +559,7 @@ int dm_bm_write_lock_zero(struct dm_block_manager *bm, return -EPERM; p = dm_bufio_new(bm->bufio, b, (struct dm_buffer **) result); - if (unlikely(IS_ERR(p))) + if (IS_ERR(p)) return PTR_ERR(p); memset(p, 0, dm_bm_block_size(bm));