From patchwork Wed Nov 27 07:21:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180261 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp5735784ilf; Tue, 26 Nov 2019 23:22:22 -0800 (PST) X-Google-Smtp-Source: APXvYqwzrEgKAjnCqupW4xJWc1qspnleZHHjy//IoPAJm9qvoltM4C8N0oNR6wwUiHuyqHxzZyKT X-Received: by 2002:a05:6402:1609:: with SMTP id f9mr30514364edv.37.1574839342414; Tue, 26 Nov 2019 23:22:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574839342; cv=none; d=google.com; s=arc-20160816; b=Nh3KPibptWWwPPTnBgfxa4Fyb8vFCxUd/hyYG/ochS/ysgm2E6hMstels287GQQBrF aP4iZlAlMgRTd0AXNp2W67I+WRxTzg9oMkPo2hiWWtjI8o7/eOURMQPqeQWO2r89EqJf 1mUwB8advmWTkFzlZpr22HCy5ri5q9PgZ9eh/ORvHsqcDmBC7X2lNoImxOTCoFm/fLAE o3s1LLN75jEHhxuBztLj/RXmK+C4p7T1ndOyf0H8IFhz54oblsHqvae6asmpstj4Skb9 eff4ahgikcn0FIZxTMN3UoF2hPRixAt1ALnkMPl570ks6bW6MjV7sDCuWujzj+7/CU2P KcRg== 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 :message-id:date:subject:to:from:dkim-signature; bh=HKmKV2QnHf6L1Be1GDSF8wA+iVwfLA2DutY1g50TZSQ=; b=V61iehRQse9jaGLjgD05Y44MUWeVq/1JeagO9rsPFfBIX3OzoNHj3j4stH1R32ncY/ 3S1SuuFLm12v2G/NxZ3qy6rNAfKtfdgmJ0JEevFqHBHpjfQiBC5le4GxnmTc668rOVI9 sarJgR8hlOhRrzGRcDksqL05JHCEWh4aYSbNAR5DKiAzOXtShgb22QdIwYqy6Pj1zvaO oYLQctzvn8Jcd4THi8z+48YND5iR0FKGYaCOGKxLZJAvqwx+1QcthItpSz6TT6WlgpWv qqM74R8zpkBrlWOtTNr1epCvM9ZcEoJazwXXmhTnkWwxH19f6P/0+6futgBONZJjSwyq jstQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Jg5njij/"; 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.22; Tue, 26 Nov 2019 23:22:22 -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="Jg5njij/"; 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 S1726496AbfK0HWV (ORCPT + 15 others); Wed, 27 Nov 2019 02:22:21 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:38200 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726470AbfK0HWV (ORCPT ); Wed, 27 Nov 2019 02:22:21 -0500 Received: by mail-wm1-f67.google.com with SMTP id z19so6164356wmk.3 for ; Tue, 26 Nov 2019 23:22:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=HKmKV2QnHf6L1Be1GDSF8wA+iVwfLA2DutY1g50TZSQ=; b=Jg5njij/oyiKokuTX0ohPbHSfU9jBIYmc/stO5Vcs4RAaz31O6VQje2pl3xgAAPTaV VSYlns4aPHRqAeDNv9lO4VkKXAdIgJEm2xD3/+PLfsMTmCXMm7cbbSDujG0TD7sAo/C9 MQdRBupS2ZleKSa3ntXHDO9XWRCXYyrJbINRCMK8YZRYwRiAKQCAkLO5b+kUdQS6L1mz nyqkvCobjXHDmrw/1GB997iWS0bHbCISYKYOsJrBqUvtl92CFeGo42sXIOECIfj7v6k0 0pbda73Rw8JKcsBsqV3AUcBQwcJNgTo0ygAfV0n6fouiNVNyJle3O+oCBEJ5KUNFjZYb ZDhQ== 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:mime-version :content-transfer-encoding; bh=HKmKV2QnHf6L1Be1GDSF8wA+iVwfLA2DutY1g50TZSQ=; b=gU7vIN6d7Z38sB+08Z8rVSZiNNt7keDtbf+jkNelaUkNnXnInQz0iQaLSZx7W4O2r0 XsCxL9FUkRjKRf5MrcbDIM9it0oylN8QLxu4ncvTs0BfSZco4sU/hBxJupjtEKW/IB64 EFlqhAf1c5FLLQ5+cKKHWlnelhX7dUQwjiI28MT7Cni7A2zA8zWwF+tdfv4T6blwcR+n HD54NgMcMqxAy25+kxWwPQj15GGjuYlRfeTgFLLP6evpyF/d2aoEUIiK1/g3r4uuvjwG 1CYatQJygKZDl8yLwa5FSfd4P/bez0ZEg9JoZ1/D8xhZE7MT58tfohsEfLNgH2Cv/4GR dzNg== X-Gm-Message-State: APjAAAUIxvRW4IdjsluCJfiCoNTEV4GC8mqxmmFlAX8BrD8TyXg4svCc dNf4zYtppNNzzyQENmb7Yvrzc03y7G4= X-Received: by 2002:a1c:8055:: with SMTP id b82mr2841390wmd.176.1574839337328; Tue, 26 Nov 2019 23:22:17 -0800 (PST) Received: from localhost.localdomain ([95.149.164.101]) by smtp.gmail.com with ESMTPSA id d20sm19406915wra.4.2019.11.26.23.22.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 23:22:16 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.14 1/5] ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary Date: Wed, 27 Nov 2019 07:21:58 +0000 Message-Id: <20191127072202.30625-1-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Chester Lin [ Upstream commit 1d31999cf04c21709f72ceb17e65b54a401330da ] adjust_lowmem_bounds() checks every memblocks in order to find the boundary between lowmem and highmem. However some memblocks could be marked as NOMAP so they are not used by kernel, which should be skipped while calculating the boundary. Signed-off-by: Chester Lin Reviewed-by: Mike Rapoport Signed-off-by: Russell King Signed-off-by: Lee Jones --- arch/arm/mm/mmu.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.24.0 diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 70e560cf8ca0..d8cbe772f690 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -1195,6 +1195,9 @@ void __init adjust_lowmem_bounds(void) phys_addr_t block_start = reg->base; phys_addr_t block_end = reg->base + reg->size; + if (memblock_is_nomap(reg)) + continue; + if (reg->base < vmalloc_limit) { if (block_end > lowmem_limit) /* From patchwork Wed Nov 27 07:21:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180259 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp5735773ilf; Tue, 26 Nov 2019 23:22:21 -0800 (PST) X-Google-Smtp-Source: APXvYqzHisVMuvB5fDxVKjqDUIq5MkrAEIpL1XfPABFOY7TQ6I+iyeZmmukqtwz8Xick9qwHk2fO X-Received: by 2002:a50:f699:: with SMTP id d25mr29555662edn.72.1574839341434; Tue, 26 Nov 2019 23:22:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574839341; cv=none; d=google.com; s=arc-20160816; b=yM/RgPNSnJyKK7c0MnQ2l4aZ69quVmOs2nGhuvpIghGOIpt2goGSnDjF5R4DO57tYF MegktYjiHxSxQWJV1UAI08W7nRnSKcxv4FP806CgD5VuYlSUO8KH+lw8vqUo4cff9q6o rUHzLyFBBs3AHkw7besxt/z/Mg9gzA+WrUHZtvMHM0LfJ+bSITbZUFP8w2bIFVt+NQKA i1S1k49SAP3HKf41Xnzm4boSWcnaQpXyLBDsIMHN6mV/SvxhbE4KAIku1FgAN3vl3Ctp eZ0Bq00V5CI0sHiww/D+8ESzmsWS81BEldp3hTyL0pofpbNtiY8rRP/kDRoZhV7BkeV8 HZrA== 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=Gy06tYfgg/j4igOn88GPHku4s1HMYQmNNOQvmkqJT/M=; b=ab5cLCE/z3d0OmvGXBZhdoOpWwqvMERA/XZ3WReq7O6tTdBxtG0VyLa6eApJFLXmDb NWtmR5A+m34sANX9C9FxU3e8rj5R1lypFbJT9T6AAev2e28oKxQPNduS8sCla2YQ78EP sDC0teoB9Dpe2/RjT+OSNBBWdlsvv5j4JtrXexzAqFIiWryiOckc9zS5ub6Z/d8OP44K wZWXku4wGrk0BlxNsWRrigwwmHawN3tzyqDgOuw8zRiqnxbXI2NgRe5qHEDKwevyapy7 7Lf3jVhIsxx6kYz2VmaWwb2tiirjOtVFjVnCNC7e4To2vV6H7gXwhckkdMQljSmC6llS WjWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bo5QgBMt; 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.21; Tue, 26 Nov 2019 23:22:21 -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=bo5QgBMt; 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 S1726512AbfK0HWU (ORCPT + 15 others); Wed, 27 Nov 2019 02:22:20 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:38202 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726227AbfK0HWU (ORCPT ); Wed, 27 Nov 2019 02:22:20 -0500 Received: by mail-wm1-f66.google.com with SMTP id z19so6164407wmk.3 for ; Tue, 26 Nov 2019 23:22:19 -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=Gy06tYfgg/j4igOn88GPHku4s1HMYQmNNOQvmkqJT/M=; b=bo5QgBMti8HYRZf5cM9otFSJRwsKxonSGMMsJE0+XQDQdTV21UshShxcpKM+ovTz3o lEZ8/mV3K+1R/qwDUU70AgTGRyJNV4Gbpc4vJVU38zq1kcLVV/bfWRVFZxzPjPTDLpkd NprC5x4uz6dODMmaNmntnez4PI0T62CvUUSTKvHC3Kq8fY/IrJHTzCy4WymYUuZeYQc4 lag/W635AwkQfptTQJ8QlSL08djiGXDcyHiHaZuP9My8q6NwDNVzN/pkDvtPJQUROlsk E6zcDIQfLkzZ9Q82pYABe3ddr//8g1PQ6KqW9ThG7ZAjsmixryNY3Niwha0adYsTtg+R 1/5w== 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=Gy06tYfgg/j4igOn88GPHku4s1HMYQmNNOQvmkqJT/M=; b=Vmp2i9eti1EQczMJbKAHP76LLHAu7zdEYxryK9Nosv/yF+iOd4CPPDDwdw+qgJzwb9 +lBWrzMIOjKUdTax9gJEHPsl+s2ecHb7yeZJ8sUPOf5UBdj/Mhe/DXdCriaadZd2tH5A JgeKKmQhJGgZ0AYRNjZtVjd0kioFrvAPbLL0kM0SHIcGDs9S+gXq7GVocIzngtobD0UC bpZ24dFXaJ3x3DlGmknOX+vQ5eoaaZs+9L07oMJQwDBxwBVkHzeEVLtSMlXLl2flSvx+ 3M3ASPZ2nLOqE9laNAmpmhyce04LOgVFPO0h87rcAeV/MjLNj3oYgSdWWyvhA+KEmN8d E04w== X-Gm-Message-State: APjAAAXbsrMw17RqMEQXEUYdCRtMvNIE8g7y54EW6d8uXvZULnCyK+X8 UB+lnjBZl7rzLuy57oxeLdNOW82xnW4= X-Received: by 2002:a05:600c:1088:: with SMTP id e8mr2873864wmd.7.1574839338267; Tue, 26 Nov 2019 23:22:18 -0800 (PST) Received: from localhost.localdomain ([95.149.164.101]) by smtp.gmail.com with ESMTPSA id d20sm19406915wra.4.2019.11.26.23.22.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 23:22:17 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.14 2/5] media: siano: Use kmemdup instead of duplicating its function Date: Wed, 27 Nov 2019 07:21:59 +0000 Message-Id: <20191127072202.30625-2-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: Wen Yang [ Upstream commit 0f4bb10857e22a657e6c8cca5d1d54b641e94628 ] kmemdup has implemented the function that kmalloc() + memcpy(). We prefer to kmemdup rather than code opened implementation. This issue was detected with the help of coccinelle. Signed-off-by: Wen Yang CC: Tomoki Sekiyama CC: linux-kernel@vger.kernel.org Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Lee Jones --- drivers/media/usb/siano/smsusb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.24.0 diff --git a/drivers/media/usb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c index ec759f43c634..3ab72d653737 100644 --- a/drivers/media/usb/siano/smsusb.c +++ b/drivers/media/usb/siano/smsusb.c @@ -226,10 +226,9 @@ static int smsusb_sendrequest(void *context, void *buffer, size_t size) return -ENOENT; } - phdr = kmalloc(size, GFP_KERNEL); + phdr = kmemdup(buffer, size, GFP_KERNEL); if (!phdr) return -ENOMEM; - memcpy(phdr, buffer, size); pr_debug("sending %s(%d) size: %d\n", smscore_translate_msg(phdr->msg_type), phdr->msg_type, From patchwork Wed Nov 27 07:22:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180260 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp5735778ilf; Tue, 26 Nov 2019 23:22:22 -0800 (PST) X-Google-Smtp-Source: APXvYqwuQ5Ub2VJfBbFcvtwkFHTcH5xkyvnhRxSqjFwFNEZu97urBaGsMoe60khFUYvNZFXo0lCi X-Received: by 2002:a50:8c02:: with SMTP id p2mr30072464edp.30.1574839342019; Tue, 26 Nov 2019 23:22:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574839342; cv=none; d=google.com; s=arc-20160816; b=nwwp31IRwqlkbmxYmaXZLj/vL5WFKGVJp6M4/TEPzIYkbNM1U2/oEJbqtRXI1Ioq+/ L5TyCHfdpkGtgq/e/u1KaxQmZwDqp7ltSD/v2oetXqX/shrdljI846D0KwVVgvKADh/9 yVrB5oWIA0BY6u63wfkWecf+jyZPqEfXN6/fTzMfB9aCX0SRLWiwZMwrteJSZyi1DmIX V2bCFPrkkYvtAomUh68F3lmGQm8P6yVQvGqw9Vim+bT3hCZ413rrUwZIhk12W/0KoyW4 kN8eXxD1+S6FozLtpACmasVP8tEHOR0PvABDi9wN8mU3iWfOpUDJmu0dsDiDNkZv6U90 o7Tg== 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=UkHzamxVtuUS7zemJUdLlEXA8p8MD2PYQZDZcwjFn+o=; b=fl1TUAgVFPHCa/64vRKQWQwIhKpaPh8W0fvlY7eoLSjLU/6Z97K99q65pmEX6WtHLc /leYZnM3byZz+tDpu5FI10PGa1lnL5TP0nKnvlPrPa9iFN/tz3CpumUqwQosd2kzOUUk w3y5U3O5FVQtztrkerP0Fvupq33/Vw7lv65Gu5HdVXwTintb5FHRPxuCFyoIeou3U830 oNKu+YeTT/KisA5S/ojzYO01P0eCY1h7oNP6ns61gGBJtZ/G6II3PZM+nOXtCtZXljUH RsxMr4UfvXbLCG8yX3/V/o2j/XzGjwKZw5BrfjO5igz7uQI6wuJC5+dtpmTloJTN67G7 m96Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U+OC6opP; 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.21; Tue, 26 Nov 2019 23:22:22 -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=U+OC6opP; 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 S1726227AbfK0HWV (ORCPT + 15 others); Wed, 27 Nov 2019 02:22:21 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:36719 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726496AbfK0HWU (ORCPT ); Wed, 27 Nov 2019 02:22:20 -0500 Received: by mail-wm1-f67.google.com with SMTP id p17so269769wma.1 for ; Tue, 26 Nov 2019 23:22:19 -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=UkHzamxVtuUS7zemJUdLlEXA8p8MD2PYQZDZcwjFn+o=; b=U+OC6opPrUtU67vosJD0CgnLoh9vPISVqDlzzGGINRMwbypZA4NK/O83RmtBCCzqZT QZXOYotXfS02yb297VPejf/ipF2EDFl97YCK2D5xXc8Y27MZF/M7/Jcs0A8IZsvVBp6G yNenyVPel9Zma9T98xQzFYK+vUkNhYPBzOKSLzuTVmMZWqUx0VgAyackHC7SgkP0mgnx C8yC1hbOTl6FYSE+efFA/tQuWl8z7jNv1s7y3tcKtDjBlpeAswA307TnEjneJhXNVGuG 9dDoFM0T3T+xPBhqpcK48M095ManHCRb7lVuZkdHEPo20lPpXVulU0l+KGyy7M1rv1ue M14Q== 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=UkHzamxVtuUS7zemJUdLlEXA8p8MD2PYQZDZcwjFn+o=; b=dc5M4AExKTysXMAE0spfeDA5sQe5ZfRwVs6UOrLlOo/ERhGKJPe24WqoQDkVeE0SvW /D0nhFpH9215AmI8hkk2ixPuCRm4gyqECkHdleDhYLJrjHl6NWSvjF1/jBVuCIB5RZ0j kbrqbsBYqQpzIR8p/RIurLjREzMV5tnJCwKiN4478/InrMEnUkC3NpRv8RMeHJpEpR2I EzlJo5VS3Lq8SG5e76eQd8IMwxWdMMg9oQikK4dd7davOdg+IoYePWx2rZyTe6hgY/p9 Dd2+VFhCWFAXPbowaSfwdiAWDGndaEDv0cuZh5UwDouwVjgz4J4bNMDHUesesnZ2P1Du eq5A== X-Gm-Message-State: APjAAAWp1YjKINHpv7UOEd2ZZ/wMQCRfL0Le3c24vJKIzU84DKCkdPGF QVHYfkVGgKgOb/dgZ/G3W8fg7CygfK0= X-Received: by 2002:a1c:ca:: with SMTP id 193mr2718360wma.111.1574839338891; Tue, 26 Nov 2019 23:22:18 -0800 (PST) Received: from localhost.localdomain ([95.149.164.101]) by smtp.gmail.com with ESMTPSA id d20sm19406915wra.4.2019.11.26.23.22.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 23:22:18 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.14 3/5] arm64: fix for bad_mode() handler to always result in panic Date: Wed, 27 Nov 2019 07:22:00 +0000 Message-Id: <20191127072202.30625-3-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: Hari Vyas [ Upstream commit e4ba15debcfd27f60d43da940a58108783bff2a6 ] The bad_mode() handler is called if we encounter an uunknown exception, with the expectation that the subsequent call to panic() will halt the system. Unfortunately, if the exception calling bad_mode() is taken from EL0, then the call to die() can end up killing the current user task and calling schedule() instead of falling through to panic(). Remove the die() call altogether, since we really want to bring down the machine in this "impossible" case. Signed-off-by: Hari Vyas Signed-off-by: Will Deacon Signed-off-by: Catalin Marinas Signed-off-by: Lee Jones --- arch/arm64/kernel/traps.c | 1 - 1 file changed, 1 deletion(-) -- 2.24.0 diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index a4e49e947684..5ae9c86c30d1 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -648,7 +648,6 @@ asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr) handler[reason], smp_processor_id(), esr, esr_get_class_string(esr)); - die("Oops - bad mode", regs, 0); local_irq_disable(); panic("bad mode"); } From patchwork Wed Nov 27 07:22:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180262 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp5735794ilf; Tue, 26 Nov 2019 23:22:23 -0800 (PST) X-Google-Smtp-Source: APXvYqzQDwMkybN/QT0EaVJhw9YSHawN0YTQstBLhEU2ZvofoosAYGpAfPNp+RP92oqT7km/H6SR X-Received: by 2002:a17:906:1c59:: with SMTP id l25mr47017495ejg.98.1574839343225; 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=uBAHfcGsKfG+ZUjZNCpQD117MDZvdmZJwOgyw2+wzefzUEnxFTnaR+2u763HM3sG3C oTL56ijXSqkgC7+MnXsakFonnnhqdfianr0ZRB4oOKrNbAWQqmComdfOXPa96KCo9ct3 Shcgyq9p4PCvOzog1wzd/sYorOPyZBBZLmQ0XUNhCehcunVJK3eLUfoOYsO1Z31TzaBP 1wHwq37FeZVZBcofQnDC8rVeNjl+Qm5D2ZJHLlBu1O1343VRPewt0SIUh1Fnr2V4hQ93 /k6uuFNtsq9C7wbW8EQhtyMouOPnj5TMMyTULiUZCO5q/1XfbZWhjM1oftv3H27AoGLp jiUA== 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=yrZu99BLvlhrth7qw3JOZy62Wr9zwC7/qBHtCS/hJhk=; b=dwYHVWXdmCz28GKfZOfDeyYMxv0ahABSjrsNHK0YGa3EMfxUmNcE4TLGOPYBDfQ/sT 3YhnsdPpW2yIpjGdxd2ifVtYsMbjUCHtLwAFl/JUNdvVUKVN6ZUstPoinWYFOKQkcwGQ 1rhGquCtulOxzXo0Nato4N5eEUB9iKlQlte2xz+7najXN0el64zZJxai+jXozQEq44fw 32JJh8mAJzXBDmmsAFC5StJCCntrFAUJB9dxDLQWJGmLN4cSJ08xOyPB7I1ARXATudNg HHu+ps7bZROqEqcPSte4y1jyW39gAC3RkglOKv2s78AFE0i9HNYWTdlrki9Amw7VMmIT PFdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZjmzfNUd; 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=ZjmzfNUd; 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 S1726112AbfK0HWW (ORCPT + 15 others); Wed, 27 Nov 2019 02:22:22 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:50737 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726510AbfK0HWW (ORCPT ); Wed, 27 Nov 2019 02:22:22 -0500 Received: by mail-wm1-f67.google.com with SMTP id l17so5907648wmh.0 for ; Tue, 26 Nov 2019 23:22:20 -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=yrZu99BLvlhrth7qw3JOZy62Wr9zwC7/qBHtCS/hJhk=; b=ZjmzfNUdXO+aIr1Wqss30fYLj3iyDh+W3fpfe2SMcvyCWhR6QS5EBcNx1wcM9V3dJy mOIRI57IQ8MU6gBTGccDcVsEy4/CFbmDSvX+9PwuVOyAyoaIfDFvBwRWIsT7Z7lAxg1T 8vhfK2Ql5N5tGmqRlBFxb7lZFhQNtKSoU6wKmT21kmlpXp7y2GZP2YFttITIeeTd6a21 6O3YZQxL3v4EMoW+hnbWBHDJrAkU6hpDCxeoMdNYWa/bveavu4Jb/w1I4hqafmg3b6VG JKNXsxeXN8lq/ez7SQgSZVTLVYzB8Kio00x/EZHeD56XKDe7fjCk7opp2tPZw+F1NqXZ z5Ag== 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=yrZu99BLvlhrth7qw3JOZy62Wr9zwC7/qBHtCS/hJhk=; b=Omy98L1W/rRkxT8tNGsA6SjYuM4y1D224YOIksz4AfEBylDd76XgefX5KBVeuQhx8B q1VGh5m6h4UVwYw0UPMTn7PKbJQSVmoMJYKocBzpY97Y3qCFKgAgjyOePwIaWd1fnC/z wO/3t0m3Q/94fHH5TlWeD85ivAr5Bt8KdLMynGqh1LeVxY26PUxhYyLNAqBHsExyuzfD MTcxJs55/iLcw7G59rBQ+s7BIYCn9k2PDnGQNxlB25vIKrCw5l+kfALRFh/aj65EGk4q fAes+p+FOvxxVu2saW2TXDEqsAT4Ny+WKMZTkoYbuwFD1LOr8ZFdwq15OI9X6QYwUGzi UJlQ== X-Gm-Message-State: APjAAAWqsVn1Gn3QeCd0B8yVJMy3hiER+OVfFXzLH30XafPtqH92zGG6 jVo227qvQl+a03ledyv3FfjmWqVxkFU= X-Received: by 2002:a7b:c5d0:: with SMTP id n16mr2873459wmk.78.1574839339774; Tue, 26 Nov 2019 23:22:19 -0800 (PST) Received: from localhost.localdomain ([95.149.164.101]) by smtp.gmail.com with ESMTPSA id d20sm19406915wra.4.2019.11.26.23.22.18 (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 4/5] cpufreq: Skip cpufreq resume if it's not suspended Date: Wed, 27 Nov 2019 07:22:01 +0000 Message-Id: <20191127072202.30625-4-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: Bo Yan [ Upstream commit 703cbaa601ff3fb554d1246c336ba727cc083ea0 ] cpufreq_resume can be called even without preceding cpufreq_suspend. This can happen in following scenario: suspend_devices_and_enter --> dpm_suspend_start --> dpm_prepare --> device_prepare : this function errors out --> dpm_suspend: this is skipped due to dpm_prepare failure this means cpufreq_suspend is skipped over --> goto Recover_platform, due to previous error --> goto Resume_devices --> dpm_resume_end --> dpm_resume --> cpufreq_resume In case schedutil is used as frequency governor, cpufreq_resume will eventually call sugov_start, which does following: memset(sg_cpu, 0, sizeof(*sg_cpu)); .... This effectively erases function pointer for frequency update, causing crash later on. The function pointer would have been set correctly if subsequent cpufreq_add_update_util_hook runs successfully, but that function returns earlier because cpufreq_suspend was not called: if (WARN_ON(per_cpu(cpufreq_update_util_data, cpu))) return; The fix is to check cpufreq_suspended first, if it's false, that means cpufreq_suspend was not called in the first place, so do not resume cpufreq. Signed-off-by: Bo Yan Acked-by: Viresh Kumar [ rjw: Dropped printing a message ] Signed-off-by: Rafael J. Wysocki Signed-off-by: Lee Jones --- drivers/cpufreq/cpufreq.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.24.0 diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 4aa3c5331666..52fc08a92bb9 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1673,6 +1673,9 @@ void cpufreq_resume(void) if (!cpufreq_driver) return; + if (unlikely(!cpufreq_suspended)) + return; + cpufreq_suspended = false; if (!has_target() && !cpufreq_driver->resume) 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 */