From patchwork Wed Feb 13 05:46:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengguang Xu X-Patchwork-Id: 10809575 X-Patchwork-Delegate: snitzer@redhat.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 49FE41390 for ; Wed, 13 Feb 2019 10:34:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 369691FFE4 for ; Wed, 13 Feb 2019 10:34:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A3FB2BDEB; Wed, 13 Feb 2019 10:34:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F0FED1FFE4 for ; Wed, 13 Feb 2019 10:34:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 73A1CC06021E; Wed, 13 Feb 2019 10:34:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 30C915D9C5; Wed, 13 Feb 2019 10:34:56 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 58EEF3F604; Wed, 13 Feb 2019 10:34:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1D5le9U002829 for ; Wed, 13 Feb 2019 00:47:40 -0500 Received: by smtp.corp.redhat.com (Postfix) id 48D711969F; Wed, 13 Feb 2019 05:47:40 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mx1.redhat.com (ext-mx02.extmail.prod.ext.phx2.redhat.com [10.5.110.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8C58460BE8; Wed, 13 Feb 2019 05:47:33 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 81E2189ACC; Wed, 13 Feb 2019 05:47:31 +0000 (UTC) Received: from localhost.localdomain ([218.18.229.179]) by mail.gmx.com (mrgmx002 [212.227.17.184]) with ESMTPSA (Nemesis) id 0MaIPo-1geSMq2qZE-00JuMu; Wed, 13 Feb 2019 06:47:29 +0100 From: Chengguang Xu To: agk@redhat.com, snitzer@redhat.com Date: Wed, 13 Feb 2019 13:46:56 +0800 Message-Id: <20190213054658.31598-1-cgxu519@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:ZLDqO+4mfQpmhlZoN8lRq7Pfj+nMXraN1xyLHkErbb5IXIA2ujK cs0q0kp3QvsjwCAIB1OnVgXxl39eSCm1iGjanpy/+TpLRAyg7GyhE8uux4/nAuvrxqtglqt bEzoIyEWCbd4CkdAtAgIqKupWQwy4atGqLU5iUemHW3snXdvDt4XHuasbh2rxnkxOrr74Vz 7FWrwcexYgE9w+s1wgt7Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:XNvU0MTJRVw=:ENvHz6Lh9Ay/00ELpfedyB ii86Zn5yWZo2u058SWlEvcrmBJhF/tJUDXseYjqmCSvsEO7PNlEhi6KQxS3z0GxSYblrIGQqn 9bo9i44MuBDg2sMGhmh4mMwPVLFzCF5f0ZyTNwq1s3dsq5RtgOAXTlG9uCZ6YAoEM3a9T99NN YaFtQegJCE/OtV+RLVDEdPrtiZJ1iK2tkQBKze2nYM9ySEBgZq92evrQJ1oXUZ/hnaWnSkqBy KOFG7h3NhmTnWQY0Ik2IMWgcv11Ye3kCNIe1yOy+7xZYsMTHnlcWr2iUaR02onclRQiZ4s4zY QMTtiX/wWEDdbcdvcBZR17YvK4+2PB4qZ/s5U4iCFe1wMB6xqEa1qXMlItqqnYp5v/yPcvtBl PTyzwtJZnxWdZF/uCV4DpBomwmZA0Bb41cWjlEnj5D4HCjC9rHh3adUVVOTrq14VRCheIzOUo mKeip8UqrJxKdU2puSFUxrlw2Ppi52WPUv99RTeUxdG+uTHzr/sv4TiWXRs36PJ4ponAWbEz7 6EbxFqyJ1MvhKyx+5WJ0o9m/S40FIxUeUvwBnBiHHTwr/hrRZkh+zcheHUoE18IHSy/uKEkzl x2w0vV9kQn3h1QBJhSQWvnE6gMMjcWi/C+TB02GRAZkYs5DzhGgibMfgcJP2/b0mZMsbGxqJO y6E/3qkpme0sNwu77pmi0b4xzcgb72v7dhk3okfh7wDMgs3X+4lSSRCgAKJDlDGjm8XBxGyEk UUAO5xfNL1AAanafF2WwEbGucpI4Ks9vQsKMb49sRi7OJOhyZhb8FUC1YDpfMq72Fm5n1ioCb OWbiVKnVtKC1L0s4HFuNjSBOOBBeBuyVgHiAsf0hAA+U71SdVWTPIhVdXttnN9gN+51R2mzkP DaTz0HUTHo9Gd0w0tDFNbtPFZq+1kR3laWDGbl3tdlpUTZEdKg9cztjKPEcMcW X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 216 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 13 Feb 2019 05:47:32 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 13 Feb 2019 05:47:32 +0000 (UTC) for IP:'212.227.15.19' DOMAIN:'mout.gmx.net' HELO:'mout.gmx.net' FROM:'cgxu519@gmx.com' RCPT:'' X-RedHat-Spam-Score: -0.45 (FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS) 212.227.15.19 mout.gmx.net 212.227.15.19 mout.gmx.net X-Scanned-By: MIMEDefang 2.78 on 10.5.110.26 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: dm-devel@redhat.com X-Mailman-Approved-At: Wed, 13 Feb 2019 05:34:52 -0500 Cc: Chengguang Xu , dm-devel@redhat.com Subject: [dm-devel] [PATCH 1/3] dm: remove redundant unlikely annotation in dm-integrity.c X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 13 Feb 2019 10:34:57 +0000 (UTC) X-Virus-Scanned: ClamAV using ClamSMTP unlikely has already included in IS_ERR(), so just remove redundant unlikely annotation. Signed-off-by: Chengguang Xu --- drivers/md/dm-integrity.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c index 457200ca6287..f1ab81b19de9 100644 --- a/drivers/md/dm-integrity.c +++ b/drivers/md/dm-integrity.c @@ -1122,7 +1122,7 @@ static int dm_integrity_rw_tag(struct dm_integrity_c *ic, unsigned char *tag, se return r; data = dm_bufio_read(ic->bufio, *metadata_block, &b); - if (unlikely(IS_ERR(data))) + if (IS_ERR(data)) return PTR_ERR(data); to_copy = min((1U << SECTOR_SHIFT << ic->log2_buffer_sectors) - *metadata_offset, total_size); From patchwork Wed Feb 13 05:46:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengguang Xu X-Patchwork-Id: 10809579 X-Patchwork-Delegate: snitzer@redhat.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D4A3B184E for ; Wed, 13 Feb 2019 10:34:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFE4D1FFE4 for ; Wed, 13 Feb 2019 10:34:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B47FD2BD81; Wed, 13 Feb 2019 10:34:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1D08526253 for ; Wed, 13 Feb 2019 10:34:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9F97E4E908; Wed, 13 Feb 2019 10:34:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 313216031D; Wed, 13 Feb 2019 10:34:56 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 82DDB181A00C; Wed, 13 Feb 2019 10:34:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1D5llDi002839 for ; Wed, 13 Feb 2019 00:47:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3F5C25D704; Wed, 13 Feb 2019 05:47:47 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.31]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5A4585D6B3; Wed, 13 Feb 2019 05:47:40 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 03ACAC047B7B; Wed, 13 Feb 2019 05:47:39 +0000 (UTC) Received: from localhost.localdomain ([218.18.229.179]) by mail.gmx.com (mrgmx002 [212.227.17.184]) with ESMTPSA (Nemesis) id 0MbgWb-1gd5K91w5l-00J5YX; Wed, 13 Feb 2019 06:47:37 +0100 From: Chengguang Xu To: agk@redhat.com, snitzer@redhat.com Date: Wed, 13 Feb 2019 13:46:57 +0800 Message-Id: <20190213054658.31598-2-cgxu519@gmx.com> In-Reply-To: <20190213054658.31598-1-cgxu519@gmx.com> References: <20190213054658.31598-1-cgxu519@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:O6gF4xIID1ujYHIQ6KEtCLumISeBXy+u3THK5kTHE5EXhn601ih 9HHPD87u2Ol5xdKw3w55lxGCnWTpYJt3HUnuF42GRqBcqVO8tvYgbEqQiK3rAjt3B0cdg6f Jvvl4nYUgywwwfVObs90tkeQ60OAtCkKPRiXcrhkHhG5hjC+5pWJ7PiS5bt1uaRhHbxFYAD ElHmd/OwY/K21dh3Cnkcw== X-UI-Out-Filterresults: notjunk:1;V03:K0:D1JBk8+inuk=:r93iUN76k1Ufc+Z8nv32I6 8twjROsCrLdWaHAz9TSbVyWunsgq4NHKcfowV6/z7pXzMv/C8PWpN1hcdXLiis5/+juEj6T0p HsKkOqUkEau7yebQN+WWkpq/8K3aHrhv2GYD/QXhvxrykxHk9jB6WgzI5bqUr81xycQeyYbvL ZvDj4TPx84eXo4MkzDIUYcNODL3BobCalgBbaU0tlazhaOZtxqglow65bJe1fmIC8qxAmAkYt ll52mHfun5gnpWXyKkG7LYMITwHCTxFtsR7Vd3iPggC/AbfY/HR7rKjVxhpvngFSM1BeGAuTQ bB7nj49SEsjbYYHSGNi8LRVbt2LjLltHwUmIXxAmSidMeychsH5ygUYM7r7Q0qdB7Z9sRnQiP T5fs7r6I86EYZiph9oaovaj6IWAYJVYv76SwLFp2bBjn5b3FMuJnQm4nyvHeVmZNNefo8Gt5L ZdDOasgUNSMtctXG1yuRDdE0Fezd4+hq8mn59bRTnZe9Yo7cy0Y0B0/P+67tpV+I4s/iNf1Rd 72W0HfiaVnYBEmUZ1OJ7+VFO5xtCv6BKoaHi3sK1QHuNktcbCy4bOSu8KcyPnXbWQ8HJqWmkW otZJ/Y8JBVhDLmG5aiOOZHZYis7kOFZKyzrA0bZtvKGLJEKrLEwXQGTeJzXG3XOK+GLphWZC2 +g99WFKoVJoCE5AnUh32GD14vFyzZiAByU1fBt44GMpYUBnS6ENEhXKVE572+cS88VvZudJ/G kZ3HK/FTxxzxGF8zKXNYZSyUIKHeaQoP+fDScB2cg1ap23bckD8bfZLsltHpMjrmglcBDkvTi WDGb9iZWJl7q9crSbgCqSidua00kHz7qHkvk26wNh9SIZp6JVwLGhncKsEVfQZliev/Mh+YRL xEoMQORdbr1hFkGB1V9AaId3ojujNya8PfCEa/Vya+tfdcDCzn5SO5oIBUbTh7 X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 216 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 13 Feb 2019 05:47:39 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 13 Feb 2019 05:47:39 +0000 (UTC) for IP:'212.227.15.18' DOMAIN:'mout.gmx.net' HELO:'mout.gmx.net' FROM:'cgxu519@gmx.com' RCPT:'' X-RedHat-Spam-Score: -0.45 (FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS) 212.227.15.18 mout.gmx.net 212.227.15.18 mout.gmx.net X-Scanned-By: MIMEDefang 2.78 on 10.5.110.31 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: dm-devel@redhat.com X-Mailman-Approved-At: Wed, 13 Feb 2019 05:34:52 -0500 Cc: Chengguang Xu , dm-devel@redhat.com Subject: [dm-devel] [PATCH 2/3] dm: remove redundant unlikely annotation in dm-verity-fec.c X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 13 Feb 2019 10:34:57 +0000 (UTC) X-Virus-Scanned: ClamAV using ClamSMTP unlikely has already included in IS_ERR(), so just remove redundant unlikely annotation. Signed-off-by: Chengguang Xu --- drivers/md/dm-verity-fec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/md/dm-verity-fec.c b/drivers/md/dm-verity-fec.c index 0ce04e5b4afb..b634fa23f4c4 100644 --- a/drivers/md/dm-verity-fec.c +++ b/drivers/md/dm-verity-fec.c @@ -73,7 +73,7 @@ static u8 *fec_read_parity(struct dm_verity *v, u64 rsb, int index, *offset = (unsigned)(position - (block << v->data_dev_block_bits)); res = dm_bufio_read(v->fec->bufio, v->fec->start + block, buf); - if (unlikely(IS_ERR(res))) { + if (IS_ERR(res)) { DMERR("%s: FEC %llu: parity read failed (block %llu): %ld", v->data_dev->name, (unsigned long long)rsb, (unsigned long long)(v->fec->start + block), @@ -163,7 +163,7 @@ static int fec_decode_bufs(struct dm_verity *v, struct dm_verity_fec_io *fio, dm_bufio_release(buf); par = fec_read_parity(v, rsb, block_offset, &offset, &buf); - if (unlikely(IS_ERR(par))) + if (IS_ERR(par)) return PTR_ERR(par); } } @@ -253,7 +253,7 @@ static int fec_read_bufs(struct dm_verity *v, struct dm_verity_io *io, } bbuf = dm_bufio_read(bufio, block, &buf); - if (unlikely(IS_ERR(bbuf))) { + if (IS_ERR(bbuf)) { DMWARN_LIMIT("%s: FEC %llu: read failed (%llu): %ld", v->data_dev->name, (unsigned long long)rsb, From patchwork Wed Feb 13 05:46:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengguang Xu X-Patchwork-Id: 10809577 X-Patchwork-Delegate: snitzer@redhat.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8E8BA746 for ; Wed, 13 Feb 2019 10:34:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A82C1FFE4 for ; Wed, 13 Feb 2019 10:34:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6EAD82BDBE; Wed, 13 Feb 2019 10:34:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 55D172BD81 for ; Wed, 13 Feb 2019 10:34:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9D858C058CB0; Wed, 13 Feb 2019 10:34:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 320F96031F; Wed, 13 Feb 2019 10:34:56 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 53DAC3F603; Wed, 13 Feb 2019 10:34:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1D5llX2002840 for ; Wed, 13 Feb 2019 00:47:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3F6CD5D706; Wed, 13 Feb 2019 05:47:47 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mx1.redhat.com (ext-mx08.extmail.prod.ext.phx2.redhat.com [10.5.110.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CFEC75D6AA; Wed, 13 Feb 2019 05:47:46 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 48C57C05AA51; Wed, 13 Feb 2019 05:47:45 +0000 (UTC) Received: from localhost.localdomain ([218.18.229.179]) by mail.gmx.com (mrgmx002 [212.227.17.184]) with ESMTPSA (Nemesis) id 0MAyZg-1gm3cR19ro-009uTQ; Wed, 13 Feb 2019 06:47:43 +0100 From: Chengguang Xu To: agk@redhat.com, snitzer@redhat.com Date: Wed, 13 Feb 2019 13:46:58 +0800 Message-Id: <20190213054658.31598-3-cgxu519@gmx.com> In-Reply-To: <20190213054658.31598-1-cgxu519@gmx.com> References: <20190213054658.31598-1-cgxu519@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:uO7Xg8pfK7pxBP0ejy/VfxYbS49KxwpLD4b+Te2F3F5jxm6yWod 6rF8ERo3mw53Af5CwDCivpOHB9pl0EsLAZ33x9ARgLWXHyVAvx/vhkSdYrEq/64GtWyXEbh uIjgpif2X3uW9iusWqJ26rPiOIWYhpIOP7KESZPNhf17vjCPt2LPPxys4NqlFJso9quNdBU qaUmL/IeHT+hl+wRiTU0w== X-UI-Out-Filterresults: notjunk:1;V03:K0:LCMxrOTbMs0=:A+gGnU9i4y0tqoUU61C4Qr OeRBvH4yol9f8O/jAhgPT0W9nk2dLPepGL5KGKW1DKIOWtZkKuCeiZ98nJQtKTdOYc4EItWfJ aCFev1geGtCRD7G3YWwsBPn8xDo55BX7HVh4CY9752SrUPXYWBGOpeHc8p02as92iJlxZKGZZ k2zTW9jHfvo+h890IC7/CGm6kBPgRNHHkem8K943FlRnkc93lVrdjzn+jDs7O0sZpGxQS7Lm2 dvHQeOe7155o00Kqyw9lOfGIURO6gbgoT9nXObuGMUJcJ2ZeyWmm0hzb1S0k9cdeVH8yiggT7 kG8PDeP4GgVGU1sCe9X2tNWNdkJ7BQx9Eb5sFG2BvLclleUFMqO/QZmeEUjC29PcAl7JAtW1V t7CYAJPfsWMOHn2owDLs4+pkLoGul3JOxaoiiwK0cS7PbyV0vgrdxrEKMg2aW62htlQRUG6bB 0yJfoxQl34GJZxB2FT4mnDwbKywhZ10hmGf96Jcqlgwnf2qayvGdMtF24JtKLYoTKAwmRN4I8 WCr+ZtoxNAT+JLOi+CeFhobWfjjkH+Gn7Wj9EV9iaA7za3AIHr/ua68SuEKhiMzT4+8xfYjcN +7wr6E2ZSr+o9r628hna/SSU6nEnHZxC0EVbiCYKbuiesXEwZZfssx44pB9tjKEPM/a0Pg9Xk bwKhw2SqNENPdFDT8yE9tEUKIcZCvvbJ77JC0OsQTd+QVB2eucDGAUl+hNstzqxm7/kexTMVY 4+53whK8ZU8qSKLWAEbLpYlT1gDFoeQmdbmj+CL+8ibnu8W89QG0UbOrQtzCqYAAzAYHK8wzL ZAmHptriMJ/QMIrisRWSVVWFF/6sus7Yc0OkpC/0ifIQEquW6uhxLkf9rSUqlHnRaAkTDiJU0 49lYGPS8hDQwxvgrXyoSOy6H8Uf3RYq8Oo5TxqSHjGGqY55CSUbD8q0gDc0cyH X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 216 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 13 Feb 2019 05:47:45 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 13 Feb 2019 05:47:45 +0000 (UTC) for IP:'212.227.15.19' DOMAIN:'mout.gmx.net' HELO:'mout.gmx.net' FROM:'cgxu519@gmx.com' RCPT:'' X-RedHat-Spam-Score: -0.45 (FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS) 212.227.15.19 mout.gmx.net 212.227.15.19 mout.gmx.net X-Scanned-By: MIMEDefang 2.78 on 10.5.110.32 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: dm-devel@redhat.com X-Mailman-Approved-At: Wed, 13 Feb 2019 05:34:52 -0500 Cc: Chengguang Xu , dm-devel@redhat.com Subject: [dm-devel] [PATCH 3/3] dm: remove redundant unlikely annotation in dm-block-manager.c X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 13 Feb 2019 10:34:57 +0000 (UTC) X-Virus-Scanned: ClamAV using ClamSMTP unlikely has already included in IS_ERR(), so just remove redundant unlikely annotation. Signed-off-by: Chengguang Xu --- drivers/md/persistent-data/dm-block-manager.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/md/persistent-data/dm-block-manager.c b/drivers/md/persistent-data/dm-block-manager.c index 492a3f8ac119..3972232b8037 100644 --- a/drivers/md/persistent-data/dm-block-manager.c +++ b/drivers/md/persistent-data/dm-block-manager.c @@ -462,7 +462,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)); @@ -498,7 +498,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)); @@ -531,7 +531,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; @@ -567,7 +567,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));