From patchwork Wed Nov 27 07:22:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180265 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp5735942ilf; Tue, 26 Nov 2019 23:22:31 -0800 (PST) X-Google-Smtp-Source: APXvYqymlghA6eBDRgOrPuhWPfby4xZ0pnnvs0t+lTVQFjfgSY9Xui8xcHP2rQxzR0pX39kKI1KZ X-Received: by 2002:a50:8c02:: with SMTP id p2mr30072965edp.30.1574839351711; Tue, 26 Nov 2019 23:22:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574839351; cv=none; d=google.com; s=arc-20160816; b=IIbXNAxcQUuo9GkDWpA5aYV8gAaAs9akIg2HS+6j8WbMRyDA3Xns0fzwmlTRoowl8i Bz8l3ao5m6peurmt+V+u6y/5jwF9RkhfqFnFKBBOOGAzdROou/RyQpGdO6qmd/i0AYRN r6FZqTVJZTCC7K9EYiMLuGkoKnfGejgyxvky7kKdFMr1E5HgfqzHEXW38amypgaGFdmU JRh1ZX0ol2Tgq3gwu7IVj4qr1fG8EBt31r78jWXSSVfxipK5YW7DRnxzVVCvypRcts2t 0XH2EH4vqAY1pcDJyyLIFq91XTOH4DYoCXBDb0KA+wW5g7PQYlR7FcKFt24mF/n5ngoV GQiA== 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=pGX23hmz91I1hVCX2PBQK2x2zyM7e2qWXG1Dd3x0TEU=; b=J60gNS40sxRuIARzwwYpM5LaZdgLg1PaZJQQ5lci20yEz+KjaXXXRv/KYT+jPNWTyY vpSYUpu2uNnLfcw115Q/6spr/2OnNVkiRkDcvLwNEVvWWqoaZkQOdBLgp8h7PHOF8MfX sSgdn9OA5l/SYJsTHB+xepLKq70g5tRNeFcfK6SpG5FyDs6xfCZra3XMZG7aZFdIrjuk VeReXfQDrGceMhQrSW9igNovKbcLi8OxpH4ZVfKrd6vJyVNztqYEGxaJjxpI+xA07doP XQnkrs8h+eELENTQw0pOHfqe0DlvZiP7ztwjplUPWd7mO7fQZVkABV0sCuVl76tCJ9c2 7k5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JU+OA2Tx; 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 m19si69058ejc.66.2019.11.26.23.22.31; Tue, 26 Nov 2019 23:22:31 -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=JU+OA2Tx; 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 S1726470AbfK0HWa (ORCPT + 15 others); Wed, 27 Nov 2019 02:22:30 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:38040 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726510AbfK0HWa (ORCPT ); Wed, 27 Nov 2019 02:22:30 -0500 Received: by mail-wr1-f67.google.com with SMTP id i12so25435271wro.5 for ; Tue, 26 Nov 2019 23:22:28 -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=pGX23hmz91I1hVCX2PBQK2x2zyM7e2qWXG1Dd3x0TEU=; b=JU+OA2Tx+sCieIUBKnseglWk56a9B55Y1OVcW+ZqUXHsPbUli6Ef+BRjNwDBfWZBsz LIZDcNjfMs8thyvVpGo8vdc0M1+kiN4pi/aaE45U6nBoIJrfHLVvBhOPsc22yrMt9RNp OI49Nw0RrL0RjJ/jZXneNujFjlJrOKiGOpd7OaLKmzNbHxipp5XrfyNO9SWHNoP0LF+N TNxBqUu1ci+pfMfyOjez/bMdUYsHdt/RgSI4DNQ18H+Wqq2ua5bZsfligzZwNMlyzuND 1DUsJCE0dbrGgsHN7nipdi5Kr4GvKqL4rgEp2Hks9/XykP7oQ+V1ryqE08pfzBHfud4l 9A0Q== 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=pGX23hmz91I1hVCX2PBQK2x2zyM7e2qWXG1Dd3x0TEU=; b=AVgxY9PEezSrgNtTnGzwdfHViq8z//TR5DZM0bGlL28v3WD2mMvpc63lZFnlaNmWhh iYH0BiG4qZVFp/qpn5KYS7mv5r5eVxsVH2v46WHuvqrvgHUADKKwp2nI7C5BALxc4NNR MA658UdnCCY4JfFEPjtoufQFzxGTlGTUzuQAItsE5PzhhW9IodD6MvR7U5t/yDYF1jch FtNBMQS49sYO/tXfM+zcRnkVAY+dzdFJ8BMxyuQQ208kYEyPNBCF9m8Hdbip485pf9hs Xm/6txKJLE5oeEmmKFBq7y3OO6BbVTAv1EtaVE5O8r1qefh80MeTQMept+6zq8jSqjTY CY8A== X-Gm-Message-State: APjAAAWwZW21n1JDF1S6Xq9lWDWWaUtBYMtI6Rap9kAcoiDVw+d6/2sj xbJAg7CpbHZwUP2eUE42pgayo/LC4sg= X-Received: by 2002:adf:f606:: with SMTP id t6mr24454036wrp.85.1574839347996; Tue, 26 Nov 2019 23:22:27 -0800 (PST) Received: from localhost.localdomain ([95.149.164.101]) by smtp.gmail.com with ESMTPSA id c193sm5986641wma.8.2019.11.26.23.22.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 23:22:27 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.19 3/3] ocfs2: remove ocfs2_is_o2cb_active() Date: Wed, 27 Nov 2019 07:22:10 +0000 Message-Id: <20191127072210.30715-3-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127072210.30715-1-lee.jones@linaro.org> References: <20191127072210.30715-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 933aac5da193..178cb9e6772a 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c @@ -3603,7 +3603,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 d6c350ba25b9..c4b029c43464 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 e3036e1790e8..f2dce10fae54 100644 --- a/fs/ocfs2/stackglue.h +++ b/fs/ocfs2/stackglue.h @@ -298,9 +298,6 @@ 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); - extern struct kset *ocfs2_kset; #endif /* STACKGLUE_H */