Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752447AbdGGTRN (ORCPT ); Fri, 7 Jul 2017 15:17:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52456 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751809AbdGGTRL (ORCPT ); Fri, 7 Jul 2017 15:17:11 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C918F7CE06 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=rpeterso@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com C918F7CE06 Date: Fri, 7 Jul 2017 15:17:08 -0400 (EDT) From: Bob Peterson To: torvalds@linux-foundation.org Cc: cluster-devel , linux-kernel@vger.kernel.org, stable@vger.kernel.org Message-ID: <860127602.29256695.1499455028797.JavaMail.zimbra@redhat.com> In-Reply-To: <345457636.29256639.1499454960354.JavaMail.zimbra@redhat.com> Subject: GFS2: Pull request (merge window) addendum MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.10.64.2, 10.4.195.5] Thread-Topic: GFS2: Pull request (merge window) addendum Thread-Index: zmv66OZCmfSKZ9IBzvZ/4U3JnRk9fg== X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 07 Jul 2017 19:17:10 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1473 Lines: 41 Hi Linus, Sorry for the additional merge request, but Andreas discovered this problem soon after you processed our last gfs2 merge. This fixes a regression introduced by a patch we did in mid-2015, so best to get it fixed. It just re-adds code that had been there originally. Please consider pulling the following additional patch for the GFS2 file system. Regards, Bob Peterson ---------------------------------------------------------------- The following changes since commit 9b51f04424e17051a89ab32d892ca66b2a104825: Merge branch 'parisc-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux (2017-07-05 17:41:31 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git tags/gfs2-4.13.fixes.addendum for you to fetch changes up to 961ae1d83d055a4b9ebbfb4cc8ca62ec1a7a3b74: gfs2: Fix glock rhashtable rcu bug (2017-07-07 13:22:05 -0500) ---------------------------------------------------------------- This is a high-priority addendum patch for a regression introduced by commit 88ffbf3e03. Some code was reverted that should not have been. This patch from Andreas Gruenbacher adds it back in. gfs2: Fix glock rhashtable rcu bug ---------------------------------------------------------------- Andreas Gruenbacher (1): gfs2: Fix glock rhashtable rcu bug fs/gfs2/glock.c | 11 +++++++++-- fs/gfs2/incore.h | 1 + 2 files changed, 10 insertions(+), 2 deletions(-)