From patchwork Wed Nov 27 07:22:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180263 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp5735801ilf; Tue, 26 Nov 2019 23:22:23 -0800 (PST) X-Google-Smtp-Source: APXvYqzTyueN+DDKGoXEIs+oyKRtEUkJg4wNLq5jxmyoHFTsTNgkP8MOLCY1TUBpO2SDLRwxQrtZ X-Received: by 2002:a17:906:80c:: with SMTP id e12mr48139500ejd.59.1574839343740; Tue, 26 Nov 2019 23:22:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574839343; cv=none; d=google.com; s=arc-20160816; b=turNaJvuT9pOUgtJm5c//Qq+d3jYH3lqhHgu1FCI9Manly7KTnAClBvUZLZVKR121Z /x69tDB7EjcUbtL2am9oZ2lE1X/Q+OLvgfrubYmtGyJUUUkpYx6GpnJ6C+W4DIxLZtPZ 071oyLskgA62uyjX33pUvEbLT4cD6RyzLjqtoIZzMexqlD8o1D/lZF0XuC9UTPwIU0p8 GK7ov6mgGLLSLLMBxq+jQI0HLX6+3uaCZ7pyuKqtV/5BcvOrf1gb7DYp4+/LsDFIBYYO k4QkPZqo2DmMyGwZpz7wyh0cGIUNvi1tAV9zc0VMYuxX4ywgOXEDWMHc5V1SO7yjAMAH GrbQ== 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=r5yCXFnVpf/+wFjhIjRathmPjXVlRdSy5MUPHiScEF8=; b=BGHgRpucRxKPbuTJMeq1OcWvWyuowTQK371LFaahW5YRO+NyvX9kMV8+f9hb/oLZkn DaJ0tgFeWVqczmNV11uqRi+lKim1QpoVT3Kq63wIsNhk3+UeR34NuuzX5NXfCAKYCd9+ /Ycq8+jN3DEwoK4Sz3oFHeAuU9Y/L0hYgdCEGOpz/meV1TkvOTlwzj6hvm7h9Y1etolA t+EZZaQk2vYAdqRCCg73wiwauXSoqQZSM8nsQLzLxJ/qIWnbsFadPRpclHalXRXoWZnb WMroof4nn1UEpg4popthQpXP/L7S0huQHCi2B3HY4yx0xJXcSfHTZL3JZCCQmk4vAjwH XwOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uH37JdLC; 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.23; Tue, 26 Nov 2019 23:22:23 -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=uH37JdLC; 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 S1726135AbfK0HWX (ORCPT + 15 others); Wed, 27 Nov 2019 02:22:23 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:54179 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726470AbfK0HWW (ORCPT ); Wed, 27 Nov 2019 02:22:22 -0500 Received: by mail-wm1-f68.google.com with SMTP id u18so5869339wmc.3 for ; Tue, 26 Nov 2019 23:22:21 -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=r5yCXFnVpf/+wFjhIjRathmPjXVlRdSy5MUPHiScEF8=; b=uH37JdLCjAnhXqYT/mFI0z3Q/TLAtQ5Tr1RQ4QrhTtGQ73VNJRaCQ+OUiyrZAio9xh jWu7SeBFGyIE+2kRA2AZuevUGobmyCepOzTSpELv2OzKGU4prqRJo51GjI/AWoG+EJK0 oUpbFgxOSBy8IvMdR941BQ5QeaZIILToJGbwoPjTGrE3ExrLnduSBFKxnvQ3nVnS6wiN bJO2QPhBIGmYgxR15AlhmTGbtpw9c/dd1f2/EL+GSq3rXZV+ff87sodEUk2V01Yptt8W SDA5feLV72W+Xagpe12/8JXP8a55JfgBKXwFfue8cHXfqWk9SiTlCtcZ42zymoPMgZnb OcQw== 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=r5yCXFnVpf/+wFjhIjRathmPjXVlRdSy5MUPHiScEF8=; b=IHCHBYKzOoC+oLyKsfTcz8jKFH5qFnPKneQw32If1Py951h2Eqm7/u/Gxsg3fmVQvP bbrfY+pJNuC4ufMRyIMkitD79Ca4VsU0RWXO8bqlmLhcdnTPcc9B556cKyekGbpmG9EN dRZ1NUiBkdgf/P8lQQx8+tv0DwME7YdqIadsrDHaSe644cL53aWfeC+77C+TnMBd+/fC i21VSXg9TUAG3zREWVZjk9ax8E10rNLJj8PhLaAK+By7VFa3oEPjijgFYJHMNp18yCMk SLoOAdLSjuexPBXLivAZPrNYxguralYeGFcliBZVHVjscz/FEmREFNNPjyeZXuxATiw/ plxA== X-Gm-Message-State: APjAAAWeVcq1LQ5zl4wFiiLKRT7+K2aC7xMCYj5zKci4Otzqv13LC0FA a8M9zQahL6e3FEJy2X0zoSlhXdGJGLs= X-Received: by 2002:a05:600c:a:: with SMTP id g10mr2821003wmc.69.1574839340590; Tue, 26 Nov 2019 23:22:20 -0800 (PST) Received: from localhost.localdomain ([95.149.164.101]) by smtp.gmail.com with ESMTPSA id d20sm19406915wra.4.2019.11.26.23.22.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 23:22:19 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.14 5/5] ocfs2: remove ocfs2_is_o2cb_active() Date: Wed, 27 Nov 2019 07:22:02 +0000 Message-Id: <20191127072202.30625-5-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127072202.30625-1-lee.jones@linaro.org> References: <20191127072202.30625-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 5193218f5889..e961015fb484 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c @@ -3422,7 +3422,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 */