From patchwork Tue Jul 4 12:51:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Gruenbacher X-Patchwork-Id: 115755 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1199854vqx; Tue, 4 Jul 2023 05:57:59 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5mkLoEh0lKsw5/pOSnglfSNbhEUeVvwc0POq/ryY9gA2Q6MbL77mzl94NBzDoyI8GhYzkT X-Received: by 2002:a9d:75ce:0:b0:6b8:19d8:6925 with SMTP id c14-20020a9d75ce000000b006b819d86925mr13490819otl.12.1688475479459; Tue, 04 Jul 2023 05:57:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688475479; cv=none; d=google.com; s=arc-20160816; b=IyCqDmMq/t+xoDP8t5JHo1fNxwVY8AxZT0LDhfwzm5VRni0Pwat2i9b5vQ281tJd/k PFjbLqDCJoP07LBCkGbbUbb20ZqfO0hVuCD/KZ/ptZ2wEG1TxpGzkpu18ji40DlU0zBy hZd3UJECfkGsMMBGK4jNXq8tdulqwObllrLP8/g+GbuAhZ28z9F8R/hfRT2RcCaZm10g vnHPRcUUe+5i4yTN0Ffbzo8oGoTGy7+H8NbqHf6D0xnQXc4YK6JToUorl9Su+/5/9kUX zC9ot130PSifNxVmUKMIbBEGvuv0yiGEYABLZ7/sXZIBwOOBf8WyNniDbxolfRkIaIGg L+fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=PZk500Vjo2zHZFB6Duq7QLOSIloUgOYsIqbl08CJolY=; fh=AU6hKmwOJTLNgzbpYToLhWAPapj+RlSFvfWSSjVGlkY=; b=hq0ZQrTcIbke/y9iJL/JTHrb7YFCVtfoOGiqRYxUoAYXgYcQD++y4qQbxhjDGKwgiC IjzsV2bxDxRdt74HQznQ926Ig7mGX3ZXRWkGRk/K0RnrNINLusfKXmc44Wsqjl3+D327 kg8VM+a6mWaVM2bF772AHpDDDDT93lL5VLkWet7cjXBe//t9btuJZuFq1RO3oSa0485P HsG4fAZj7bPg3mjvbc9TFfClbKZteBTxAkdEd4Ygnedydxbx6gQ6B4gPeY6ZQYmtUsBz 2axJRTAV+l3HghP0dc7ewR/UVyFOYPaVgUxPP7lZcRreYQBIdSLcICGrVW5QRrDgYl9f /gaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=b1SO1yDA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w4-20020a634744000000b00547b25ea099si21025834pgk.682.2023.07.04.05.57.46; Tue, 04 Jul 2023 05:57:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=b1SO1yDA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231367AbjGDMwC (ORCPT + 99 others); Tue, 4 Jul 2023 08:52:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230379AbjGDMwA (ORCPT ); Tue, 4 Jul 2023 08:52:00 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40F8BAB for ; Tue, 4 Jul 2023 05:51:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688475076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=PZk500Vjo2zHZFB6Duq7QLOSIloUgOYsIqbl08CJolY=; b=b1SO1yDAEnWOab3fHalLSjPrmXVl66hoXc7mS4FrciIqPQHSSJS8kvuPIR7GnV+YWdDMOC IokVVFcXeyftWbDoLWuFZac9ymTLC5bB9uvIfyzDIf9TMbeGR0uai//ncFiT9Mx4TNSrjr i7Cr3B1bZf+rxhdgqI1x7kPeOzEKjks= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-486-3ihcqA8lN3uCnHfbIGb2EA-1; Tue, 04 Jul 2023 08:51:13 -0400 X-MC-Unique: 3ihcqA8lN3uCnHfbIGb2EA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1C80A856F66; Tue, 4 Jul 2023 12:51:13 +0000 (UTC) Received: from pasta.redhat.com (unknown [10.45.225.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 55EED492C13; Tue, 4 Jul 2023 12:51:12 +0000 (UTC) From: Andreas Gruenbacher To: Linus Torvalds Cc: Andreas Gruenbacher , cluster-devel@redhat.com, linux-kernel@vger.kernel.org Subject: [GIT PULL] gfs2 fixes Date: Tue, 4 Jul 2023 14:51:11 +0200 Message-Id: <20230704125111.3148799-1-agruenba@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770494863939713435?= X-GMAIL-MSGID: =?utf-8?q?1770494863939713435?= Hi Linus, please consider pulling the following gfs2 fixes. Thanks a lot, Andreas The following changes since commit 0bdd0f0bf17c5aac16f348ee4b1ebf23d1ec1649: Merge tag 'gfs2-v6.4-rc4-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 (2023-06-06 05:49:06 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git tags/gfs2-v6.4-rc5-fixes for you to fetch changes up to 432928c9377959684c748a9bc6553ed2d3c2ea4f: gfs2: Add quota_change type (2023-07-03 22:30:48 +0200) ---------------------------------------------------------------- gfs2 fixes - Move the freeze/thaw logic from glock callback context to process / worker thread context to prevent deadlocks. - Fix a quota reference couting bug in do_qc(). - Carry on deallocating inodes even when gfs2_rindex_update() fails. - Retry filesystem-internal reads when they are interruped by a signal. - Eliminate kmap_atomic() in favor of kmap_local_page() / memcpy_{from,to}_page(). - Get rid of noop_direct_IO. - And a few more minor fixes and cleanups. ---------------------------------------------------------------- Andreas Gruenbacher (12): gfs2: retry interrupted internal reads gfs2: Rename remaining "transaction" glock references gfs2: Rename the {freeze,thaw}_super callbacks gfs2: Rename gfs2_freeze_lock{ => _shared } gfs2: Reconfiguring frozen filesystem already rejected gfs2: Rename SDF_{FS_FROZEN => FREEZE_INITIATOR} gfs2: Rework freeze / thaw logic gfs2: Replace sd_freeze_state with SDF_FROZEN flag gfs2: gfs2_freeze_lock_shared cleanup gfs: Get rid of unnucessary locking in inode_go_dump gfs2: Convert remaining kmap_atomic calls to kmap_local_page gfs2: Use memcpy_{from,to}_page where appropriate Bob Peterson (8): gfs2: simplify gdlm_put_lock with out_free label gfs2: fix minor comment typos gfs2: ignore rindex_update failure in dinode_dealloc gfs2: Fix gfs2_qa_get imbalance in gfs2_quota_hold gfs2: Update rl_unlinked before releasing rgrp lock gfs2: Don't remember delete unless it's successful gfs2: Fix duplicate should_fault_in_pages() call gfs2: Add quota_change type Christoph Hellwig (1): gfs2: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method Deepak R Varma (1): gfs2: Replace deprecated kmap_atomic with kmap_local_page Tuo Li (1): gfs2: Fix possible data races in gfs2_show_options() fs/gfs2/aops.c | 19 +++-- fs/gfs2/bmap.c | 4 +- fs/gfs2/file.c | 5 +- fs/gfs2/glock.c | 4 +- fs/gfs2/glops.c | 69 ++++++----------- fs/gfs2/incore.h | 12 +-- fs/gfs2/lock_dlm.c | 23 +++--- fs/gfs2/log.c | 11 +-- fs/gfs2/lops.c | 21 +++-- fs/gfs2/ops_fstype.c | 15 +--- fs/gfs2/quota.c | 26 ++++--- fs/gfs2/recovery.c | 28 +++---- fs/gfs2/rgrp.c | 2 +- fs/gfs2/super.c | 215 ++++++++++++++++++++++++++++++++++++--------------- fs/gfs2/super.h | 1 + fs/gfs2/sys.c | 4 +- fs/gfs2/trans.c | 3 +- fs/gfs2/util.c | 49 ++++-------- fs/gfs2/util.h | 3 +- 19 files changed, 277 insertions(+), 237 deletions(-)