From patchwork Thu Jul 2 13:46:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 11638937 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4B6F4161F for ; Thu, 2 Jul 2020 13:47:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3EC102088E for ; Thu, 2 Jul 2020 13:47:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729460AbgGBNrE (ORCPT ); Thu, 2 Jul 2020 09:47:04 -0400 Received: from mx2.suse.de ([195.135.220.15]:45850 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729438AbgGBNqz (ORCPT ); Thu, 2 Jul 2020 09:46:55 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id F3C44AD76; Thu, 2 Jul 2020 13:46:53 +0000 (UTC) From: Nikolay Borisov To: linux-btrfs@vger.kernel.org Cc: Nikolay Borisov Subject: [PATCH 07/10] btrfs: Remove fail label in check_compressed_csum Date: Thu, 2 Jul 2020 16:46:47 +0300 Message-Id: <20200702134650.16550-8-nborisov@suse.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200702134650.16550-1-nborisov@suse.com> References: <20200702134650.16550-1-nborisov@suse.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Signed-off-by: Nikolay Borisov --- fs/btrfs/compression.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index 2f30bf4127f8..48ceab7be0fe 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -178,7 +178,6 @@ static int check_compressed_csum(struct btrfs_inode *inode, struct bio *bio, struct btrfs_fs_info *fs_info = inode->root->fs_info; SHASH_DESC_ON_STACK(shash, fs_info->csum_shash); const u16 csum_size = btrfs_super_csum_size(fs_info->super_copy); - int ret; struct page *page; unsigned long i; char *kaddr; @@ -204,15 +203,12 @@ static int check_compressed_csum(struct btrfs_inode *inode, struct bio *bio, if (btrfs_io_bio(bio)->dev) btrfs_dev_stat_inc_and_print(btrfs_io_bio(bio)->dev, BTRFS_DEV_STAT_CORRUPTION_ERRS); - ret = -EIO; - goto fail; + return -EIO; } cb_sum += csum_size; } - ret = 0; -fail: - return ret; + return 0; } /* when we finish reading compressed pages from the disk, we