From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE7DBC43603 for ; Tue, 10 Dec 2019 07:52:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BE61020663 for ; Tue, 10 Dec 2019 07:52:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726574AbfLJHwJ (ORCPT ); Tue, 10 Dec 2019 02:52:09 -0500 Received: from mx2.suse.de ([195.135.220.15]:49320 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726062AbfLJHwJ (ORCPT ); Tue, 10 Dec 2019 02:52:09 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 0C3C7AEA2 for ; Tue, 10 Dec 2019 07:52:08 +0000 (UTC) From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH] btrfs-progs: disk-io: Remove duplicated ASSERT() call Date: Tue, 10 Dec 2019 15:52:02 +0800 Message-Id: <20191210075202.47373-1-wqu@suse.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org There are two ASSERT() with completely the same check introduced in commit f7717d8cdb7d ("btrfs-progs: Remove fsid/metdata_uuid fields from fs_info"). Just remove it. Fixes: f7717d8cdb7d ("btrfs-progs: Remove fsid/metdata_uuid fields from fs_info") Signed-off-by: Qu Wenruo --- disk-io.c | 1 - 1 file changed, 1 deletion(-) diff --git a/disk-io.c b/disk-io.c index 659f8b93a7ca..8fe811e861fc 100644 --- a/disk-io.c +++ b/disk-io.c @@ -1248,7 +1248,6 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path, goto out_devices; } - ASSERT(!memcmp(disk_super->fsid, fs_devices->fsid, BTRFS_FSID_SIZE)); ASSERT(!memcmp(disk_super->fsid, fs_devices->fsid, BTRFS_FSID_SIZE)); if (btrfs_fs_incompat(fs_info, METADATA_UUID)) ASSERT(!memcmp(disk_super->metadata_uuid, -- 2.24.0