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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7ACE1C47088 for ; Wed, 23 Nov 2022 12:53:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238211AbiKWMxn (ORCPT ); Wed, 23 Nov 2022 07:53:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237922AbiKWMvn (ORCPT ); Wed, 23 Nov 2022 07:51:43 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9654B85EC2; Wed, 23 Nov 2022 04:44:26 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 0552BB81F75; Wed, 23 Nov 2022 12:44:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EFCB4C43153; Wed, 23 Nov 2022 12:44:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669207463; bh=g7IYyqYGwffsasbjp3k9ZP1HaqhXWwUWvgy9K4EY9qA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AD+ldrgaKXjccxydaV1e3FBiSORrf7VKTTS84wFH+6gvyCONdSMgwtclDCQ9xpFug ryYpDyzfUfUvQRq6+NSv9CXFqbSJS0jiXDds50zldh+vH/0eE5UCFZpho52XK7oYJZ csaxDTancNRUFZe/LrcBChJ5tOF866tsri/0iZuTjmqisfGjaEYm0uAMatSgbwGXnf /2MGw/Vyylw4fWpmTl7J8oRzSdgDyt+QQTWZCBJr4T19AQaB8p1mWxrFFakuR1nYjh 8hD4nKlAeJzPeTMCVl+0fWqweGj6FqQyYC4VeFZ6WVpJvspiBKVWjfUtftDlydFIsc PXiBuk0YTBYAQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mikulas Patocka , Mike Snitzer , Sasha Levin , agk@redhat.com, dm-devel@redhat.com Subject: [PATCH AUTOSEL 5.10 21/22] dm integrity: flush the journal on suspend Date: Wed, 23 Nov 2022 07:43:36 -0500 Message-Id: <20221123124339.265912-21-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221123124339.265912-1-sashal@kernel.org> References: <20221123124339.265912-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mikulas Patocka [ Upstream commit 5e5dab5ec763d600fe0a67837dd9155bdc42f961 ] This commit flushes the journal on suspend. It is prerequisite for the next commit that enables activating dm integrity devices in read-only mode. Note that we deliberately didn't flush the journal on suspend, so that the journal replay code would be tested. However, the dm-integrity code is 5 years old now, so that journal replay is well-tested, and we can make this change now. Signed-off-by: Mikulas Patocka Signed-off-by: Mike Snitzer Signed-off-by: Sasha Levin --- drivers/md/dm-integrity.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c index cdb6bee2352b..518116c1a716 100644 --- a/drivers/md/dm-integrity.c +++ b/drivers/md/dm-integrity.c @@ -2470,10 +2470,6 @@ static void integrity_writer(struct work_struct *w) unsigned prev_free_sectors; - /* the following test is not needed, but it tests the replay code */ - if (unlikely(dm_post_suspending(ic->ti)) && !ic->meta_dev) - return; - spin_lock_irq(&ic->endio_wait.lock); write_start = ic->committed_section; write_sections = ic->n_committed_sections; @@ -2980,8 +2976,7 @@ static void dm_integrity_postsuspend(struct dm_target *ti) drain_workqueue(ic->commit_wq); if (ic->mode == 'J') { - if (ic->meta_dev) - queue_work(ic->writer_wq, &ic->writer_work); + queue_work(ic->writer_wq, &ic->writer_work); drain_workqueue(ic->writer_wq); dm_integrity_flush_buffers(ic, true); } -- 2.35.1