From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D35858230 for ; Mon, 18 Mar 2024 21:25:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710797119; cv=none; b=q7uzpecWuXDRjxKHA7pxiKHyqdHrCZQs0MOKfI2Hf3D/9kRGnkHFLmSoz2Zh2pXm0YWLSFNeakJqgR9WeyFjC+oKFm0VOx1e7MQsgcdroT4Nt6hJHnKJkMSs+oiErYtyOnSswBKX+OG9aaCAWw60GPqT2I6FhAG0yxUu5gzo2bY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710797119; c=relaxed/simple; bh=1yYAUVXg471XBaEkdzLqewpUZFjkuA6bdcdrf5Xw5wA=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=D+BzNfn3oJP4lkgOwXT4iJCqYvrSkMUk+/uVcxZLnkUhQg3E/nYoHl9qER9pEDbRFUbcnvbn9XIbSA5igHADfLBWKyU6QGqW2pbCvkPVZgyrFhGexCdGHYRBx1HvjOF4L8U56yRRxrw+iPJKxWD1c5HqdJVFGR+3i6OhE52MZL8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=KHKpf9GU; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KHKpf9GU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710797117; 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=UmM1fPWNhj6tjWD2n7+gLLrX2EVWqRmyZvqXhbV7HXk=; b=KHKpf9GU6FqfNTatRM9nJAvz5M8cK2E4McNfr/1gEcbPvmhOwYzsis0crcOugjbfhynKam LWx6H6tpNYneTubEeOZ92XSYP+ap9W4hF9scPd2DasSPUodJi1w1ium5rORE1lpoGZUlrX QibctPP4FAyG2S3Kn8aK4Qe9t5u7htE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-622-2vGLZnkgOBiJpvF1xb522w-1; Mon, 18 Mar 2024 17:25:13 -0400 X-MC-Unique: 2vGLZnkgOBiJpvF1xb522w-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3218D101A552; Mon, 18 Mar 2024 21:25:13 +0000 (UTC) Received: from redhat.com (unknown [10.22.8.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E566E2166B32; Mon, 18 Mar 2024 21:25:12 +0000 (UTC) Date: Mon, 18 Mar 2024 16:25:07 -0500 From: David Teigland To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, gfs2@lists.linux.dev Subject: [GIT PULL v2] dlm fixes for 6.9 Message-ID: Precedence: bulk X-Mailing-List: gfs2@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 Hi Linus, Please pull dlm fixes from tag: git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm-6.9 (For v2 I recreated the tag with the same name as before, but now realize I probably should have left it and used a new tag name.) I dropped the commit with the bad atomic usage, and replaced it with two other commits: the first reverts the unnecessary change that began using atomic_t for lkb_wait_count, and the second adds comments to the recovery code that forcibly resets the wait_count state. Thanks, Dave Alexander Aring (1): dlm: fix user space lkb refcounting David Teigland (2): dlm: revert atomic_t lkb_wait_count dlm: add comments about forced waiters reset fs/dlm/dlm_internal.h | 2 +- fs/dlm/lock.c | 114 ++++++++++++++++++++++++++++++++++---------------- fs/dlm/user.c | 10 ++--- 3 files changed, 84 insertions(+), 42 deletions(-)