From patchwork Fri Nov 22 10:51:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 179995 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp36638ilf; Fri, 22 Nov 2019 02:53:24 -0800 (PST) X-Google-Smtp-Source: APXvYqyBMd40rSp06Sc7xpqUOwdU2uUMU6SOptET5EYKK2j2efrBueGC/Rbc34F9IgqMfoLWg+Uw X-Received: by 2002:a17:906:4bcb:: with SMTP id x11mr21998613ejv.100.1574419917914; Fri, 22 Nov 2019 02:51:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574419917; cv=none; d=google.com; s=arc-20160816; b=k8RsQroYFqbxsTRkiAixKuqmCFq7UsQycHfS68fSf30R9uP3INPp5jqRpWRszZii7K 2vOn5nLwT0pCqyASBRUSXttIQq/AJl2TeNiL/wsj9Y82oFZ8UKPLlEuDEfbeYjcI4a/r vLDAyPV0efj4gRjGCXeJKzF0lVX0UzJk4XmCk4ox6pyLExw70j6hNqVlfB7qPGQzjqt9 skbs9O4fBvUzTIk91pbjGyrLj3CdNj6UeOCCJrc0MXoM/BeVVKKthn8FC4O13Qr9Pdfp ThKU/dRCqYv9miTnZV5XmuJha+rIkbXfX2hRKOj8UWBkCnSysrSpmd1/T/1ufmDM9M80 IbVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=eZYw16U+8nuxkccXCYNgtvJx1TG7O/vbSuX+/oKS/b8=; b=RiXeKeADHx4Khbj3rbwgT7B/1RiAxXdpDe0CNwuxf2aHNMZXsS6wjZv/+xdW7qswd/ 0cMiklb83MzOdgh76OjViJT18DUMygijRL3Ecg1u3TgUKwkuvW051tFdyUqg75ls11cp HT5s0N7F7EAUQTo0JdyvQNKYdn8wlvTFMkxG8kbOcRIkRZYKZMXbQX3PZOllF1q7gdli eK44JJw+9BhaDhk/MboNOCd2aJKhVzQRVjRuwH+2eh+LG/X4Ww5DBW4rUJXjsBwWPD5c NoMG7Mhz4tVbsIJVeo2Bs1TpK4DAUSnaaJZKwiAM78sqhNhL8UyYoB+7RHtLd8gVEVFW R9gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XVNFpM3V; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h2si547902ejy.259.2019.11.22.02.51.57; Fri, 22 Nov 2019 02:51:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XVNFpM3V; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729892AbfKVKvp (ORCPT + 15 others); Fri, 22 Nov 2019 05:51:45 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:33528 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729177AbfKVKvp (ORCPT ); Fri, 22 Nov 2019 05:51:45 -0500 Received: by mail-wr1-f65.google.com with SMTP id w9so8104214wrr.0 for ; Fri, 22 Nov 2019 02:51:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=eZYw16U+8nuxkccXCYNgtvJx1TG7O/vbSuX+/oKS/b8=; b=XVNFpM3VQfxOeyUpUkOYYjbuTvz+dyp2Rfy9HnWGMHxyB7pyJKqjBJqgGVAPImm34o cAf70PF7zG5P0mgHlo2ayidtTp5vhI0pYiTfaLZ/X8iAlPCyzcJnY7t0diq8psKCYXGG a6dHwl9x8etMe8peebxVYQwjfYnAvhDhvO+CJfq5peCde8uxbXcDvFZB9gl924xOAcbU yRZzkio7PAnWtiWNzBhYxvWuACfFi+IbqodnRe1XO8LuUWROP+UTIQkrEjggW6KonsFq VewFF7C3Qpx53Hso14xzYYWKVVSp6vHUTkVFuIc9A8+gmtTAKd2jtAXEjP2NuiTxXb/E DjXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eZYw16U+8nuxkccXCYNgtvJx1TG7O/vbSuX+/oKS/b8=; b=kgJuLKd8i54pi8sZGwRnU0W7VMD2QtYAiA7vfnO0paSzSp4S/YugautAD74F7soROW EywToh1KYgVIeSiW+b5isOaiuMgikkwicazhrV+hKVTSsKaj1r5x8fgS30ihcaQ+/c27 nyZYzGxyaaEjiRuQn7foGAq+7FN1vhiS4R7lbW6GVMjZRVBtkCI9EAsf6q5bFCmuNVGy HeecD0ASJrAFcHpzeawrsI8xIQfFPpXZerDKa/x+XmQDehTgzkA+eLLZrIsFomFfa7SU Y9FxJfqiEqxJ77GgdF4iywzglksCy5F4NKVHzAYYV5eT548gdbVkf4iX3LwePBwFbGyQ hK9Q== X-Gm-Message-State: APjAAAWRqFT48tj71XvnljR3M5ip94u7eSsGWERNdxkutB5kFbIMenWU Ic7+6QlVHwlHXi5BbkfyBJNZew== X-Received: by 2002:a5d:4c8c:: with SMTP id z12mr16899509wrs.347.1574419903537; Fri, 22 Nov 2019 02:51:43 -0800 (PST) Received: from localhost.localdomain ([2.27.35.135]) by smtp.gmail.com with ESMTPSA id w4sm2894338wmk.29.2019.11.22.02.51.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Nov 2019 02:51:43 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org, gregkh@google.com, stable@vger.kernel.org Subject: [PATCH 4.4 8/9] ocfs2: remove ocfs2_is_o2cb_active() Date: Fri, 22 Nov 2019 10:51:12 +0000 Message-Id: <20191122105113.11213-8-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122105113.11213-1-lee.jones@linaro.org> References: <20191122105113.11213-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Gang He [ Upstream commit a634644751c46238df58bbfe992e30c1668388db ] Remove ocfs2_is_o2cb_active(). We have similar functions to identify which cluster stack is being used via osb->osb_cluster_stack. Secondly, the current implementation of ocfs2_is_o2cb_active() is not totally safe. Based on the design of stackglue, we need to get ocfs2_stack_lock before using ocfs2_stack related data structures, and that active_stack pointer can be NULL in the case of mount failure. Link: http://lkml.kernel.org/r/1495441079-11708-1-git-send-email-ghe@suse.com Signed-off-by: Gang He Reviewed-by: Joseph Qi Reviewed-by: Eric Ren Acked-by: Changwei Ge Cc: Mark Fasheh Cc: Joel Becker Cc: Junxiao Bi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Lee Jones --- fs/ocfs2/dlmglue.c | 2 +- fs/ocfs2/stackglue.c | 6 ------ fs/ocfs2/stackglue.h | 3 --- 3 files changed, 1 insertion(+), 10 deletions(-) -- 2.24.0 diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index 555b57a16499..faaf8bfd2f52 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c @@ -3426,7 +3426,7 @@ static int ocfs2_downconvert_lock(struct ocfs2_super *osb, * we can recover correctly from node failure. Otherwise, we may get * invalid LVB in LKB, but without DLM_SBF_VALNOTVALID being set. */ - if (!ocfs2_is_o2cb_active() && + if (ocfs2_userspace_stack(osb) && lockres->l_ops->flags & LOCK_TYPE_USES_LVB) lvb = 1; diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c index 783bcdce5666..5d965e83bd43 100644 --- a/fs/ocfs2/stackglue.c +++ b/fs/ocfs2/stackglue.c @@ -48,12 +48,6 @@ static char ocfs2_hb_ctl_path[OCFS2_MAX_HB_CTL_PATH] = "/sbin/ocfs2_hb_ctl"; */ static struct ocfs2_stack_plugin *active_stack; -inline int ocfs2_is_o2cb_active(void) -{ - return !strcmp(active_stack->sp_name, OCFS2_STACK_PLUGIN_O2CB); -} -EXPORT_SYMBOL_GPL(ocfs2_is_o2cb_active); - static struct ocfs2_stack_plugin *ocfs2_stack_lookup(const char *name) { struct ocfs2_stack_plugin *p; diff --git a/fs/ocfs2/stackglue.h b/fs/ocfs2/stackglue.h index e1b30931974d..66334a30cea8 100644 --- a/fs/ocfs2/stackglue.h +++ b/fs/ocfs2/stackglue.h @@ -298,7 +298,4 @@ void ocfs2_stack_glue_set_max_proto_version(struct ocfs2_protocol_version *max_p int ocfs2_stack_glue_register(struct ocfs2_stack_plugin *plugin); void ocfs2_stack_glue_unregister(struct ocfs2_stack_plugin *plugin); -/* In ocfs2_downconvert_lock(), we need to know which stack we are using */ -int ocfs2_is_o2cb_active(void); - #endif /* STACKGLUE_H */