From patchwork Tue Apr 25 18:11:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 9698897 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DD1316020A for ; Tue, 25 Apr 2017 18:11:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB75728459 for ; Tue, 25 Apr 2017 18:11:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BDB9D284ED; Tue, 25 Apr 2017 18:11:51 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5BEF628459 for ; Tue, 25 Apr 2017 18:11:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1430948AbdDYSLs (ORCPT ); Tue, 25 Apr 2017 14:11:48 -0400 Received: from mailrelay105.isp.belgacom.be ([195.238.20.132]:26474 "EHLO mailrelay105.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1432713AbdDYSLK (ORCPT ); Tue, 25 Apr 2017 14:11:10 -0400 X-Belgacom-Dynamic: yes IronPort-PHdr: =?us-ascii?q?9a23=3AfhvBCBCjkblM1WeOv3vvUyQJP3N1i/DPJgcQr6Af?= =?us-ascii?q?oPdwSP76ocbcNUDSrc9gkEXOFd2Crakb26yL6+jJYi8p39WoiDg6aptCVhsI24?= =?us-ascii?q?09vjcLJ4q7M3D9N+PgdCcgHc5PBxdP9nC/NlVJSo6lPwWB6lX71zMZGw3+OAxp?= =?us-ascii?q?Pay1X9eK14Xkn9y1rrbTeQRTzB+0erR0ZEG9qQD5uMNQioxnfOJ55hLXo3cAQP?= =?us-ascii?q?hb32lhbQafhArx/M251IV+6CkWsPUkoZ1uS6L/KooxR71RCnwIKW056dfqvhqL?= =?us-ascii?q?GQWG7HU0SWYHlBdURQLIukKpFqztuzf347IukBKROtf7GPVtAWyv?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2AeAgCckP9Y/zfGs1tbRwYMgkBrgW2Ob?= =?us-ascii?q?5ElAZU6gg+GHgQChBZAGAEBAQEBAQEBAQEBaiiCMwQBHQEEgmkvIylxJAESig8?= =?us-ascii?q?RrDE6hBCHQoZTgV2NVQWJM4ZYgVKLZJJ5DZFXlBkfOIEGQx0YhF0BglA+NYdng?= =?us-ascii?q?U8BAQE?= X-IPAS-Result: =?us-ascii?q?A2AeAgCckP9Y/zfGs1tbRwYMgkBrgW2Ob5ElAZU6gg+GHgQ?= =?us-ascii?q?ChBZAGAEBAQEBAQEBAQEBaiiCMwQBHQEEgmkvIylxJAESig8RrDE6hBCHQoZTg?= =?us-ascii?q?V2NVQWJM4ZYgVKLZJJ5DZFXlBkfOIEGQx0YhF0BglA+NYdngU8BAQE?= Received: from 55.198-179-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.179.198.55]) by relay.skynet.be with ESMTP; 25 Apr 2017 20:11:04 +0200 From: Fabian Frederick To: Chris Mason , David Sterba Cc: Josef Bacik , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, fabf@skynet.be Subject: [PATCH 1/1 linux-next] btrfs: kmap() can't fail Date: Tue, 25 Apr 2017 20:11:02 +0200 Message-Id: <20170425181102.2326-1-fabf@skynet.be> X-Mailer: git-send-email 2.9.3 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove NULL test on kmap() Signed-off-by: Fabian Frederick Reviewed-by: David Sterba --- fs/btrfs/check-integrity.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index ab14c2e..496eb00 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c @@ -1668,14 +1668,8 @@ static int btrfsic_read_block(struct btrfsic_state *state, dev_bytenr += (j - i) * PAGE_SIZE; i = j; } - for (i = 0; i < num_pages; i++) { + for (i = 0; i < num_pages; i++) block_ctx->datav[i] = kmap(block_ctx->pagev[i]); - if (!block_ctx->datav[i]) { - pr_info("btrfsic: kmap() failed (dev %s)!\n", - block_ctx->dev->name); - return -1; - } - } return block_ctx->len; }