Received: by 2002:ac0:e350:0:0:0:0:0 with SMTP id g16csp2040774imn; Mon, 1 Aug 2022 09:01:36 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tDv1XNJ6+Cyg+ibGsriJ7ZaaUHx9I72ld9Al7zQw7044guZjydnccpW2Xm4SmoZYhr15Iy X-Received: by 2002:a17:906:ef8b:b0:72b:4a67:8ae5 with SMTP id ze11-20020a170906ef8b00b0072b4a678ae5mr13019360ejb.763.1659369696691; Mon, 01 Aug 2022 09:01:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659369696; cv=none; d=google.com; s=arc-20160816; b=NwjbHB+YONQ1EMFUXHrqtRk7IdkxVqyXCg/jZWEO9S4PjtXNcv912RVqYr+9FWBJZx zskIFCqF/lToNaWhVYIvaBt+EnQTX7QRz6dqd6hkX+RHieEqvi42TsWIPVSHz0DSUS4W siW6vhBEboApg9XNBF/2juTcScUTppkjxr7DBNVfFX9d4vR92O3D1U8zFsMMjzteJRG/ XlL9agKJCGgeqdvd/caGCt4lc2bdJ7cTKS/GcBDrnMBNTMUABPJvyw/LZT3jRp832ENL o9QC57Dw18DZH61Q6gAE4yF0VUZ04OG2jZQzlcSREBY1ojggT1JXyaXPYUqDynI7NffG BpWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:content-disposition:mime-version :message-id:subject:cc:to:from:date:dkim-signature; bh=lHBn5LnyRO9uny/Jc1eLld7xvN44+4tID8y8dm6xkco=; b=qWk2+U1I7R+49eEbpNShbjc6molIgbQhAyF9b4nCS0AMI9m4yO7i/hhOU+2eXD22A7 HO5rFJipXpokQDvL2MOeZnrWvxfhmHsOH8ooiaOnIrSodinl0COv0PHoRnxZigU9MWyp qyI61sx634dB569yUvnhIx9Akl7viM6JNZEgIOyDziVhHkfMcYJ96ytTJ1FpqzetrLbK w6NRehW1enaxqg+fhJ+bn72M0w8Y6dNytRMR5LH75xO5+spWxEsD2sRVxxq2ET6pSueU h5IeegFRwL+ksidHP/mlqbxbg7ySl16lyC12gR7L+rcOqh+gypxRgn+0PLwm/GEq3pB4 RJnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LBHGKyU4; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bk14-20020a170906b0ce00b0072abb81b5eesi10080372ejb.616.2022.08.01.09.01.00; Mon, 01 Aug 2022 09:01:36 -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=LBHGKyU4; 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 S231802AbiHAOoi (ORCPT + 99 others); Mon, 1 Aug 2022 10:44:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232828AbiHAOoV (ORCPT ); Mon, 1 Aug 2022 10:44:21 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 07FD44198F for ; Mon, 1 Aug 2022 07:43:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659365015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=lHBn5LnyRO9uny/Jc1eLld7xvN44+4tID8y8dm6xkco=; b=LBHGKyU4PzV6xoRiRVZ8Z7TOq0FD0XFZmQVHrangiPU3/YtOalp94+UDsxe+a4Ie+A2ho3 +lutdtIEHDxUQ963aUjSlFzzkOuhdKiYjYV7Rim9FY2WcqBuYmUzhylf1ksqEb08usMJqN JfIUunnFimH9ykg0v2103C/h759WC5E= 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-633-oUHoTuR9NE27teTrZaGBKg-1; Mon, 01 Aug 2022 10:43:32 -0400 X-MC-Unique: oUHoTuR9NE27teTrZaGBKg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6592D8037AA; Mon, 1 Aug 2022 14:43:31 +0000 (UTC) Received: from redhat.com (null.msp.redhat.com [10.15.80.136]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 304CC2026D64; Mon, 1 Aug 2022 14:43:31 +0000 (UTC) Date: Mon, 1 Aug 2022 09:43:29 -0500 From: David Teigland To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, cluster-devel@redhat.com Subject: [GIT PULL] dlm updates for 6.0 Message-ID: <20220801144329.GA10643@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.8.3 (2017-05-23) X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Spam-Status: No, score=-3.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_NONE 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 Hi Linus, Please pull dlm updates from tag: git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm-6.0 Changes in this set of commits: . Delay the cleanup of interrupted posix lock requests until the user space result arrives. Previously, the immediate cleanup would lead to extraneous warnings when the result arrived. . Tracepoint improvements, e.g. adding the lock resource name. . Delay the completion of lockspace creation until one full recove cycle has completed. This allows more error cases to be returned the caller. . Remove warnings from the locking layer about delayed network rep The recently added midcomms warnings are much more useful. . Begin the process of deprecating two unused lock-timeout-related features. These features now require enabling via a Kconfig opti and enabling them triggers deprecation warnings. We expect to remove the code in v6.2. Thanks, Dave (You can ignore the premature 5.20 pull request from some weeks ago.) Alexander Aring (19): fs: dlm: plock use list_first_entry fs: dlm: add pid to debug log fs: dlm: change plock interrupted message to debug again fs: dlm: use dlm_plock_info for do_unlock_close fs: dlm: change posix lock sigint handling fs: dlm: change ast and bast trace order fs: dlm: remove additional dereference of lksb fs: dlm: add resource name to tracepoints fs: dlm: update comments about recovery and membership handling fs: dlm: call dlm_lsop_recover_prep once fs: dlm: make new_lockspace() wait until recovery completes fs: dlm: handle recovery result outside of ls_recover fs: dlm: add comment about lkb IFL flags fs: dlm: fix grammar in lowcomms output fs: dlm: remove waiter warnings fs: dlm: remove timeout from dlm_user_adopt_orphan fs: dlm: add deprecation Kconfig and warnings for timeouts fs: dlm: don't use deprecated timeout features by default fs: dlm: move kref_put assert for lkb structs fs/dlm/Kconfig | 9 +++ fs/dlm/Makefile | 2 +- fs/dlm/ast.c | 4 +- fs/dlm/config.c | 21 ++++--- fs/dlm/config.h | 3 +- fs/dlm/dlm_internal.h | 32 ++++++++-- fs/dlm/lock.c | 143 ++++++++++++++++++--------------------------- fs/dlm/lock.h | 17 +++++- fs/dlm/lockspace.c | 31 +++++++--- fs/dlm/lowcomms.c | 4 +- fs/dlm/member.c | 30 +++++----- fs/dlm/plock.c | 51 +++++++++++----- fs/dlm/recoverd.c | 35 +++++++++-- fs/dlm/user.c | 21 ++++++- include/trace/events/dlm.h | 118 ++++++++++++++++++++++++++++++------- 15 files changed, 351 insertions(+), 170 deletions(-)