From patchwork Tue Nov 26 13:47:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180198 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp4656745ilf; Tue, 26 Nov 2019 05:48:09 -0800 (PST) X-Google-Smtp-Source: APXvYqxSrY1zjuaPRdlV7XAiMdWj26WzCF9CKAypncEiGgiztYyNbEzc7PQLImos9Vml+pjhFd5l X-Received: by 2002:aa7:d7d7:: with SMTP id e23mr24592300eds.236.1574776089280; Tue, 26 Nov 2019 05:48:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574776089; cv=none; d=google.com; s=arc-20160816; b=oaz6o9rTQ4cvQT+SuXhENecehSRpZlHDlP06vRZLZkQjd9EksBwD4PhOL12Vq2HuJG 6PUxM+GZjSHkvhUs8Y7oV/FzVYpSn+Z0B3Xx3QNwksf0hTi1njcR/gbFixa8QGkkP8j5 +LlgOsltMLvTEYLS0UMggw8pG2LSXLHSN9xbAXbjlaFDmK6l7Ay8HlRju+5vTWebVq55 DjIzgU2kjRzBTVELYEMiN0QU+HmVpMPUDbLWqNJyPkSw7LK+Ve2wp6bv+WoofDbUW0TS if3qBgg6PNiv5EEunD/gCRFnuDqPWXtaRFM5G9sDWdp/dsJU/bAucJ7291vNngJRXLW1 kOAQ== 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=1q2B94XyALRvNRnvNJEB1AMhPK5UAr+ZiO6EcUlJFV8=; b=iUV3nJF7ajD0rLfgMFlpfo6Ot6YjAVRAkS4N5c+M+hHyerKI0dsYa8ttBwssqfQLoR 5/aESK175tTM6YB1/QS/+91o+N2OUF4rFwe6hoom5DEvoPc3aMqSk1+yxPJMGA8ACNSx Kvkga0j2FnTWr1T2eRxxTK8bAKAWeJ0jMmKyhn7d4rx2FxT05nvGE0McSykXpSTCr8cl kbnu27yg8rGt+EMqnclKzZZjrJ5tfPfbsW4bMN0tnJWBItYS2UcXQ+4vgdycNBmeevb3 4yRfVg96VR2ZPYWRIoOGIzDmynQON4rJcR1lIrWrL2+AgQLfZwqyyAXyQiDeca6t7vM7 7c2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="rj4k/JL9"; 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 u14si741772edy.375.2019.11.26.05.48.09; Tue, 26 Nov 2019 05:48:09 -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="rj4k/JL9"; 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 S1727792AbfKZNsG (ORCPT + 15 others); Tue, 26 Nov 2019 08:48:06 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:51163 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727795AbfKZNsG (ORCPT ); Tue, 26 Nov 2019 08:48:06 -0500 Received: by mail-wm1-f67.google.com with SMTP id l17so3317324wmh.0 for ; Tue, 26 Nov 2019 05:48:04 -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=1q2B94XyALRvNRnvNJEB1AMhPK5UAr+ZiO6EcUlJFV8=; b=rj4k/JL9cDFx/gdRc43YTVFF1MHQbnsWvHaonIT4/LodaIf7+sjqOuDeTdAh1hl+dx rncXgAwlyvCMtFsaTg9XoFJyrqA3VUDkAByyT3yTFRylVAlozG9bVdeAO4VFgM0kHXHM JbOhs5ZgrarEWnc7bvb9vUz+o4bRZmqcMs2vmoOS9v2axfLKcD9oByeb9cche7vIRA4K p0V3gJEK8ZN7jL+0ClCM98GijIafmLjXKOZC6HdKmGSiyG9OEm3Ldb0NkoJ4ZimDMh/W XvxvfIlbjzqF0kXjU39t6Yqu0wvTvOovdh4pXmiy4graZMbMiVxVW981zOVJwFKP2Z5h 4uJA== 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=1q2B94XyALRvNRnvNJEB1AMhPK5UAr+ZiO6EcUlJFV8=; b=Cr0Zo5TktTM0E4eOt77vrFuiSBgiAzCio7AE5/8B9vbNzo36XBHRHSVgcCZzmOiF1Q 2+HOoCLZTc7YaEvEx3TVj6WUzmp/cNbMI1H8/yri0Zuo7ixZHoyVDPpJXIN3r+408gma vWICbSkST2kgHj/0N7zP0jJ2UiEBsfHLqvDI1Jq5n6BVlw54t//+JkebhLUmEw3nbmZq BKjQw8YjT4IK55fFCpeOGmrKHWcvAZ1IbMguTUGBXt+F/q86zr9OVExsuht+IpTQnZx6 MzD3Zo8Wamqaq461H8imiQ+sEPkRgrtZjpudnvELAbKmpBsjl8o40xVYeY6e1UTW9asn gk9Q== X-Gm-Message-State: APjAAAU0b8z+kt+N7vzGKlf7Mb/71Xp9XX+f9ey4s2cAtF/F9F8Ej/B0 nHCHhlhQLVPNV92s5mqgisqiVOLGhnY= X-Received: by 2002:a1c:f612:: with SMTP id w18mr4670519wmc.28.1574776083324; Tue, 26 Nov 2019 05:48:03 -0800 (PST) Received: from localhost.localdomain ([95.149.164.72]) by smtp.gmail.com with ESMTPSA id o1sm15085560wrs.50.2019.11.26.05.48.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 05:48:02 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.19 3/3] ocfs2: remove ocfs2_is_o2cb_active() Date: Tue, 26 Nov 2019 13:47:41 +0000 Message-Id: <20191126134741.12629-3-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191126134741.12629-1-lee.jones@linaro.org> References: <20191126134741.12629-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 9d452c602f0558ec3b0aeab1040bdf4dfbc590eb ] 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 */