From patchwork Tue Nov 26 13:48:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180199 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp4657524ilf; Tue, 26 Nov 2019 05:48:53 -0800 (PST) X-Google-Smtp-Source: APXvYqxa8YTP3SNDxPv8hrvu2P57UvBTxpmTs0WFlaBi9fKvJQmGI47s4OzSAZaiwOyZN4pZEddt X-Received: by 2002:aa7:c810:: with SMTP id a16mr24901433edt.207.1574776133157; Tue, 26 Nov 2019 05:48:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574776133; cv=none; d=google.com; s=arc-20160816; b=MANt+yYJTH8oa/a/KH+MF9CsqBAgLLYDvDqiHOVlztVo/r4zc+JZtAeYcmhQYlAKJZ XEUeWU7bgPlISwplWKFAuxlgxmblpVGhYJkc3yRVbUav84VieddLGpQoeLkWe89bzfx8 flOY0IToMOM36h3KMzRpicYM00pU2gdOSUt0tf1gdL/YVJPu527AFngieRNlKG95bUat gDNe2qWVcoxVeWVlJOMfs2bPlVAXRFqslW4PwMqz/f8fROt3W6AhQbW1faMNQIUY3tVQ xPpkaM5Yeo8kWBnM3BFGGRBBSSZHSK3b8Ei4Jf8tePjRAp+0Jb1tHgCsl7n8x1mGohy+ vR0Q== 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=2Ne1zU2mmCseDmRbQxz1UNgNCwdBOPqdsfF2xdo9d4o=; b=GtmNrfsWQ/2cJ0US360LU0nd1RdaEaPm64ZPek4XvPyRgC7nbx3lsOSlCssG0PoOih gP5lBn88ZJx4XfsM0ugi2E7RXs688Lql0X+an8+qWCi+rgGDRx8smYlN6k9TB8SVLWkQ 9lORL67gyLOBy8uk/FlCcMKZtbi4z56oY1l94TFhyWR/5DBDSGViga7m7QVTA4mRt3wh Rd7PAq0VNL8sq4gy9uxmIGdafgMtM7cA2W1LcuPahOLOsFoiVoRcsHgaHv9Jd6KHYskq PtVhTjQAIu2/+doJ4foWRhQr7x7dqwBx0PUSRirq5zVbv3n7mxtAjqiMqT34YpckPOFu Uw8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OAPCfQN7; 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.52; Tue, 26 Nov 2019 05:48:53 -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=OAPCfQN7; 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 S1727816AbfKZNsw (ORCPT + 15 others); Tue, 26 Nov 2019 08:48:52 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:38867 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727795AbfKZNsw (ORCPT ); Tue, 26 Nov 2019 08:48:52 -0500 Received: by mail-wm1-f65.google.com with SMTP id z19so3396681wmk.3 for ; Tue, 26 Nov 2019 05:48:50 -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=2Ne1zU2mmCseDmRbQxz1UNgNCwdBOPqdsfF2xdo9d4o=; b=OAPCfQN7zSBHP+VHpPRgZfPpWLc2a1MJyHfAaC7qO1GGgo6mhSNe/rAaWxY0NYqISv DNJnoedq21rENsuVFFMAkC9s6hRk00qIq/KpKCC0B1aa84PGNYe5nVWe2jwtE6zU6bUH FPS3UcQRk1yirb6d8w1KJ31zSBPfoaPCkJwBhlZnYA4fS8taU48V32Z2kZAvI9Gzoh5T p1mvaut3RkIEITrQggEWsqn6aWd8KgMfWOs1kg9p4OPVAjct9kFTSqO+TX9qRE52o3WE 7rk6DRRL+Nrz1hMphW8MNdQMEyNmujxJTPaYEUGsruXUdZg5irx6pEOR3XjLD4UPZR/D eEsg== 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=2Ne1zU2mmCseDmRbQxz1UNgNCwdBOPqdsfF2xdo9d4o=; b=dEcSk0L5xgyrAwU1cJxRTooLLxOXKpBqwQRzE3rYi161IcJmQtAo3JFArhrHd3+iGc uMokYKt5bHILWeO1GsacpZIWldXFvkhMbySHymH5kkdYqmOUQ+BEcHQS0720RhPAQ9rb VJ/tV676SjJPplN3tlGnTXZpkX4GjgaLjDgWQUVa52nstievB64aIQgCLCdp9DA70K2C hD5JBbYrD6ipD+La0Xz/1CzA0C+6FhJcTFgf9DESoqBr1RPXHNez3q4yC0SFMh7Dqv39 9NGskjZszivoko9NAui1dSW7bi32v3/bk7+sC2JdArKqATvV6fT+eM+RGTTK+22zi/pu CrvA== X-Gm-Message-State: APjAAAWqihWw3VofpaFVtc1PgbX9seHrS9LHWwv9pI0YaMtdKyPI7UL+ TpC8K0ff2dQarp7sub+XwEv+u2gEvYw= X-Received: by 2002:a05:600c:290d:: with SMTP id i13mr4394524wmd.139.1574776129604; Tue, 26 Nov 2019 05:48:49 -0800 (PST) Received: from localhost.localdomain ([95.149.164.72]) by smtp.gmail.com with ESMTPSA id m9sm14374131wro.66.2019.11.26.05.48.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 05:48:49 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.19 1/5] ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary Date: Tue, 26 Nov 2019 13:48:26 +0000 Message-Id: <20191126134830.12747-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 59f200ef45852141dd45847563bf8e4c11a48f3f ] 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 Tue Nov 26 13:48:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180200 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp4657533ilf; Tue, 26 Nov 2019 05:48:53 -0800 (PST) X-Google-Smtp-Source: APXvYqzTKJ4fiz5ZXGeeHiCfCr+lL8Zgn6dPW164iSjijwb7QSVvfeOP1SfA3+JX6RHwMee7uGsg X-Received: by 2002:a50:b632:: with SMTP id b47mr25200437ede.289.1574776133605; Tue, 26 Nov 2019 05:48:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574776133; cv=none; d=google.com; s=arc-20160816; b=TTBI2dN04QCFLW/2jMDfo0pSmqaGQgiA4sM0rzOHlzXhkucfQuPY5r7qIwu3bsARPQ Bbt6mV7scwRAzTuS/M/6IU4oCmH5rIp8pumOtBDyRptxqmN2Uel0SnE3Qpqxiv9BoM8O PrMxjekbSwvrw+nQ2fqmA6sJ+eISmlWylSDc8QCd3W2EkglDoeZz44UAejbTf0t84u/u MTj1eKUBfe8YQNfKaFGdlbOMVIROfYPMROepD86/D6ZeMqUbti1ESMVgQwGeSE2D1ITY 0ihlzlG3TD7/AWa1/V/FGdQqqRbHLVG70tofoSyU4bbTPt3TzVLMUOnohFtoBdMbuNO1 vVMg== 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=ei5BLi24PVGgbBNVvFVWa2AE2YMFFRHMwxERyLs5g00=; b=oDjWJH2/9iuKV1+/UJjy+6fj3UTjIC8Tgz8PtxEMjdXNYs27N7eS2wvvyEico89DkC ttTrFkXMEqf9gvL6IXJ5Nz2zugSBpjsAOCXuipE3dFd6Iuk4EPmixi9WLPUrktX+Sopj FO+qZQRHLcQskykhFbuG9kEg3sLWWwjSglcZWz0WSoJWuwoeamV4UdK2sLf2ZNL4OwWH Csv8vxIY6JGVDH0g4C+3Ed/iKyir5z1eilsYWNHt+reRDbZlELSRecVjc4xBwNFr9bJB KkpJ+jqZX6ZiN39hxPmXiiO4tJkNqCCiNNMtEDe1FUBHvPUW/G+OB9Vzn9gfGtT7ZlJI 6XcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fBQOI0IE; 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.53; Tue, 26 Nov 2019 05:48:53 -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=fBQOI0IE; 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 S1727795AbfKZNsw (ORCPT + 15 others); Tue, 26 Nov 2019 08:48:52 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:37400 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727806AbfKZNsw (ORCPT ); Tue, 26 Nov 2019 08:48:52 -0500 Received: by mail-wr1-f67.google.com with SMTP id g7so1845195wrw.4 for ; Tue, 26 Nov 2019 05:48:51 -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=ei5BLi24PVGgbBNVvFVWa2AE2YMFFRHMwxERyLs5g00=; b=fBQOI0IE9FPmMigwoAkv+Zu1Nyojmqg9ZgGe2HWL52ADPKWQZQvooYrZV+2hItuwL+ sUHyJt1qtRcZ2+gZrgt92u3rf/Za9k6anYvtAAI9F1XUgFK5siKpQ8EXcZi6+buxMSMU aI1YGcT20iCAk8fZLyDaeDDKMVz1eYJoUK5d4h7qdQ/VwKKiEaHVTJtS1+pL+Oi/si3y HYMHlImmhPGhvFH2EJgoRiwcw37/mDtFF9ONA/UQGabbG7EBYcugvjp3WbYkFh+m+En0 yqNUWHoH78rel+Df7QnvwYGAe4e57g5T1AtnkMuV0jIhhwqI8tFUWIPvcGIDzU47cdYW Hzcg== 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=ei5BLi24PVGgbBNVvFVWa2AE2YMFFRHMwxERyLs5g00=; b=fx0BU9e+bU68ZmpPmnDUG3XlHYjaAc/CKYOvcmgVkxwOOiatojLlAqi/3NHofldxYU qVA6HcEozkZqIgm/u+zTNETH/A2az4dwGSJ88XS/8g9JlZw057jCxmr0XhsrZ+As9BxT R9uzWv9AyTrnfkJw3KSU/GmAXRXR4EZ1rOguHs64dL1Ll+6z3I+jzFYN2r02j9eK3zoc TLTrqorx/5Db9LblyCa4RUAjxWMzY4Pu8XJiiKx+EX0UswHMeiC9L3/wHSgOggxZc1OV qE6DsBswvzgbbroPC7EfdrS2qcBUisMJ9lA7M6dI3wfwwTYAleuUYbCzntn7NXbKyBDd qD/Q== X-Gm-Message-State: APjAAAU9DZ54EW2lF4DEjjsbo7MgMqu63k3rJSWI4dhaNPGRF4rc0png hzI3cYWFlzyb8lb+bDYshCELd1e66js= X-Received: by 2002:a5d:4e8c:: with SMTP id e12mr20301483wru.109.1574776130280; Tue, 26 Nov 2019 05:48:50 -0800 (PST) Received: from localhost.localdomain ([95.149.164.72]) by smtp.gmail.com with ESMTPSA id m9sm14374131wro.66.2019.11.26.05.48.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 05:48:49 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.19 2/5] media: siano: Use kmemdup instead of duplicating its function Date: Tue, 26 Nov 2019 13:48:27 +0000 Message-Id: <20191126134830.12747-2-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191126134830.12747-1-lee.jones@linaro.org> References: <20191126134830.12747-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 188ba34e2bcfc9a23d301bd78e35bc1d5ad9ae5a ] 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 Tue Nov 26 13:48:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180201 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp4657549ilf; Tue, 26 Nov 2019 05:48:54 -0800 (PST) X-Google-Smtp-Source: APXvYqzPaQgsafjeyhT8n8G1GoEepjlhIz4xaAJkdy3VZrS3tzZb4XuSDONbxfk6QQDbQBfjWuCq X-Received: by 2002:a17:906:a841:: with SMTP id dx1mr1724434ejb.259.1574776134548; Tue, 26 Nov 2019 05:48:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574776134; cv=none; d=google.com; s=arc-20160816; b=h7MNz2dUwinJkcHOhwOx+PiQSgESS4jhPixPDtRQ3YYd3iTXoPNcnarCwGKHtkvIlh 89ZoE6uXWLp8aMNtj596vmk4ONlHGVP3pLjtmePyl0jV0HEEDG3aYrG1ckKab6QF2Bca ZeQ6MSBMY1ikvcVn1KMQYVV/k7GuXySFX1BYYCYRbMNJMY2FO14yHEicCE1IVaCg9dDU bBW81SQM0ndu0EOlSVCaDBKgZ823W+Expp34H8sxAW5+WDnN7spyT0WYTkkK/4qKoLv6 uz9AYlZQ8S9cenzMD2d52KJdutrfNxErciWABCaTYQbV2N3DKmAc4W7Zlvx+2Xd/wnQt CARg== 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=pyCbvIo8RpUhzCaEVpT7tib1z7NzcXxt9oyOApO0ka0=; b=nQpHo8/shhj6Rf6ux59ROR7U6ICNsJUlJVRVcyKDmmzdEzFXczjXCC9J/9qRkBcWTW Rqz0t9ftfRim/2KT/iIqg2ChUWPyvYs9DyyndFRdO+m+SgFIvVNyP0oQTPdROtocMfjp TDTvTwUH0SCXUuxtn4biZRQSsS1lSA4XtSiiqnspjfdgfrAjrGyKqw0AvUaR6+ezXGqQ q/2rqxsBUOdDf9gubPaGiRt2o4cBtxpTc0c/v/eqMHOE5sMGS9QlaDocYxSh9I5apfES Gd04H8paiZoKbN1C1yHpid3reg4zReeIMDOtAG4qWvrQxunH/io6zSbFs0Prsef2yFrK XaBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NAB4M0f+; 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.54; Tue, 26 Nov 2019 05:48:54 -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=NAB4M0f+; 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 S1727806AbfKZNsx (ORCPT + 15 others); Tue, 26 Nov 2019 08:48:53 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:37401 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727807AbfKZNsx (ORCPT ); Tue, 26 Nov 2019 08:48:53 -0500 Received: by mail-wr1-f66.google.com with SMTP id g7so1845264wrw.4 for ; Tue, 26 Nov 2019 05:48:52 -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=pyCbvIo8RpUhzCaEVpT7tib1z7NzcXxt9oyOApO0ka0=; b=NAB4M0f+akwqyQrDCD0Wwi453tZGZuXbxN5ij88a6hKjFb5E7+CtKSnUkPo+Adi9C0 HZiXQnIWZ5LqUMJoEmqYsx2n7RTv7PMaYq/wKBo1qh4GS/hMZXBLksryERK3y7hXJ01n xyM9c+l2Dx6pJJCjb0ZPPUcMYx28Dtbez+tc/rwEoUZkd+j5gpBjqml4gSfwYD5gMFDC NLrMppeeWDfzMhmuykH/cYijpFRY0E+BLViO/QsRo5Qz1FNQAS6jKYyYtLfd5OMXBxLW O5icZTDrtNEN6oHbj0D/gUY5PgPbxclmfAmMc+pG82/8U6UbzpLKr/QbPfnye/9+zYnY ouKg== 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=pyCbvIo8RpUhzCaEVpT7tib1z7NzcXxt9oyOApO0ka0=; b=IRTkFKX4Kds6dZkukntHGDL6G4pLkK/YCNe2j8Gjf5z/hFzbnybr1tn5tJsg8qLWnr MRw0OJF46POqGRqa0rcKe0jmQKMO7z+uOxU5UF7Hu8FWEnOEfLgEbmCoqxMHc0Cp7xbl 1WgLCyiN8fbiErobB93V9z7XFbp+vcR8obWMHa9EGd6BhiwHufZW98UE2+nHXqGu9JdJ M2Ng8fqPaaEPVWEQRZRUfnbXGpvNXiqyN6vZ2+R9Nregxyum4QQgWS+Mf7BsqmKVcrjr rycW8L5kM89LM/7iER36v0UXwgMzeFMtrio5ezhqpVaJeZ+8o3mQomm3IBUqdSGhWB6i EXFg== X-Gm-Message-State: APjAAAVJ0m5gfWZ740u49lCa5eBwfNWVmBDMuITrqvUH5X+YcW2RDTIP 59zwCnztRHngWke2l6+JvBnRaOB0SlE= X-Received: by 2002:a5d:670a:: with SMTP id o10mr38581365wru.312.1574776131333; Tue, 26 Nov 2019 05:48:51 -0800 (PST) Received: from localhost.localdomain ([95.149.164.72]) by smtp.gmail.com with ESMTPSA id m9sm14374131wro.66.2019.11.26.05.48.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 05:48:50 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.19 3/5] arm64: fix for bad_mode() handler to always result in panic Date: Tue, 26 Nov 2019 13:48:28 +0000 Message-Id: <20191126134830.12747-3-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191126134830.12747-1-lee.jones@linaro.org> References: <20191126134830.12747-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 64cd64a02fc8bb23916ee8841ef510f2f1f2540c ] 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 Tue Nov 26 13:48:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180203 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp4657609ilf; Tue, 26 Nov 2019 05:48:57 -0800 (PST) X-Google-Smtp-Source: APXvYqwIcmgFyT7Qt/DldyB5IgMTLKMNjxsNPi3ovTj2WuBWhHu+U2FQUOLZu6QTuMcoOr0tGMZt X-Received: by 2002:aa7:db0f:: with SMTP id t15mr25510048eds.115.1574776137616; Tue, 26 Nov 2019 05:48:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574776137; cv=none; d=google.com; s=arc-20160816; b=0+Cfbrh3Y3hc2i87Lhbl0jXaUGrn6f7zJEKqSbcsj2dm0QMn1ohJD9IV+g/BZVQKMZ 573sZgGwdH+dnNIzeqRYYXwybLUPTqxX9rQs0IQ5ENsBDeMnmEiXtpnpbdWFZmvjl/x2 l3441HLl6EHyQ96LsprarsSMtpzpwSa0SuB20LwS8Tg4mhr++AzVwHAFZB42FRIPY36A ohDEyJ7fn15ml2Lc1W1Un5IxVOgXdrgrOBF4dcLvVsfpPRTYAjV6bbRxArIMZzuraXst WpdGCpBACnkw0f4Y2uB1QBDPdYDp+XrXsxNksptbuEXbINgMmH7RWzHK0LJXuyofNGAf li3w== 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=o6tdnQdXhY6/zbnPRQz5gsdIvhllvIceiXLYdtiRQVc=; b=H2re+KLkU5RJLNAd23QWDMeI7q1/wFODiw16WiWLuB+2d+YRsbaNmEvilEWPniwNbP exPJM7613tu1cWAPDdzn+kUwapte2XQQLVVmGjDtab9RJdxFYRxKKPwqsTKLyhM+jLU8 xn8vQ3zbw3sG885TnoPWeMaRXMvMLqzwqZN3tw64sUrJzuMth3CAsZHsOTcaAcwSRfzD vQizjtl39TcGU3axInLZgTgcW0A2WtMuZi3HAzWvbamjOmsg6PZ7EBEH85maR9/4Am5O H4mV+XDAw3MxN2U8Dmgnn0D53Uv72Ls1yGuBgHbt5Ghmi/PMiTxFJdwiQQ6Yhc5Pezvv BfUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Yexc471G; 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.57; Tue, 26 Nov 2019 05:48: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=Yexc471G; 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 S1727807AbfKZNs4 (ORCPT + 15 others); Tue, 26 Nov 2019 08:48:56 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:39016 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725900AbfKZNs4 (ORCPT ); Tue, 26 Nov 2019 08:48:56 -0500 Received: by mail-wr1-f67.google.com with SMTP id y11so19418243wrt.6 for ; Tue, 26 Nov 2019 05:48:53 -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=o6tdnQdXhY6/zbnPRQz5gsdIvhllvIceiXLYdtiRQVc=; b=Yexc471GQhKXS9R7cWIqe9+fqxo4Hr7jdQ4HUYzls0LXnptQl2pL7m0R2tPEthUw7K 3d38dV/1TbClXFdeFNQtEiV1pj4NXXJtFU1Z+bwJ4Fqlk4FIsRUTEnnjhGjMwqwr/yrs 82QkjjkADkZ0RSveNzA9vO3cica32CcyO9a6ahBhX2oxPgMlQrSaRsBSjPKkuIITygMP InNZJu/2A74pU6BU6R3NJTyLGJxJ9xM+Lv8rUCk14lpfRA4H84jF4AGQ1MaXBxWSD84Q A8L6D5Uatj83LB3sUDbcU+FuHMBUP3/NML5LBDdLPF8LY71biZuf+Mqp/yGu4mFqixA1 mHcA== 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=o6tdnQdXhY6/zbnPRQz5gsdIvhllvIceiXLYdtiRQVc=; b=hAVeDAQ3TJWWHLMnusBK7B/IhRcT9jXsEU2CNqKVM1yujsdpFCkpW8odzDInvLSz63 uj0GLoRtETnPuJ1okrKqnzCS/ef9iaHHy/vSJqU/PmSMe6+7d9jW/z69LbDqSymX5GZJ GeVcCNdw+r0T99HevdJXYDZLdhg4xc4fyE7UpLDKXtPeJwYziN4hVIUbscUg7q9AHQqw amsaXBmz6Sd+UzXWDbsw7Dao8JSNqIoJi9Y6UKBhyrhEEpacyXkdbIZgEVGnJqQ2Z/U/ RqLKMu3uMWfCBnyH50BBEIqUrybXZk0UIIrAOHnSejELLgHJ0yYKccNZAdN2HXVm7Ez7 EaWQ== X-Gm-Message-State: APjAAAXSOHU7VBfcsMyQXou0iY8jqWzuyhFj6u2V/5KPZW6+4Ri1Fjjp YS3IPCarAifgI+9tHcgH4eOFMQPW1Mo= X-Received: by 2002:a5d:4810:: with SMTP id l16mr21688298wrq.127.1574776132261; Tue, 26 Nov 2019 05:48:52 -0800 (PST) Received: from localhost.localdomain ([95.149.164.72]) by smtp.gmail.com with ESMTPSA id m9sm14374131wro.66.2019.11.26.05.48.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 05:48:51 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.19 4/5] cpufreq: Skip cpufreq resume if it's not suspended Date: Tue, 26 Nov 2019 13:48:29 +0000 Message-Id: <20191126134830.12747-4-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191126134830.12747-1-lee.jones@linaro.org> References: <20191126134830.12747-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 7815c05f24b49fe6e70505905e3773cd27c17b6c ] 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 Tue Nov 26 13:48:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180202 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp4657599ilf; Tue, 26 Nov 2019 05:48:57 -0800 (PST) X-Google-Smtp-Source: APXvYqz1wQNrEogOUi+NYZ3YJ5qfmd9zcJJUp1T7DJycb/p2DrZk1YBY5yfw4CWid6TZwnJ9Pm8A X-Received: by 2002:a50:b632:: with SMTP id b47mr25200738ede.289.1574776137193; Tue, 26 Nov 2019 05:48:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574776137; cv=none; d=google.com; s=arc-20160816; b=CpaYVIb3f3Bu+NrmjIUI3r961lmlQ1pwTMrqTXRvMfGOW9HPylnED8GUbHWWmT0PEw 9owJwA5cMqpK+pyJD4NufC7cZjnOxJkNHBWzohunAb2eiVzDsH6MeXFDijdwR2RNyYBo vUPZtEPOz9AZsPTSAFra+CbQc/nJIyh65H6XfnV72wCf4SIGF4PIM1tG3IJdJTKzR856 TYZHzpGuOkBmMoYU6v1WKhc7hrYgs5Dq17URDSANXXlqUZisvmmY1QDPNTPVTXy0cuUw YQrBkea2JlzrNb7OL4gJ+aZ9LL2Oxb0i5R6qNsXE8BSPbGzTkJqLdGEklhqCp1Vlwwao 5CZg== 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=KNL8F99/kiNCZPUhXHP/twsEU6K48GLn40QObRuuXis=; b=KvwsGZjwIYuHPfzWY36JQa6w3UkgwRdPaSQug6BasAq3gZrr76BCMoqgJbmom2qlXM UcLpq74ftC8LVFMznGq6+NOjbNIqcJJ2w7+e5pif9dgDSc6ytfs7b0a/dnQh3h8PDw6H 2TQJY1eMVBFT0YFw/PlLgZuCVH5CuGzeltUMy3nec9WZCGPHFu4MufKdpySORt+J0fmd RDbeskQWkp3HZrMv0f15xtm52cvtEnqBXtw6e/0PFlik4Om2qjrNcHlxiKrG9XD8C7P7 azB26L1zMHw8H67k2pIHChtUac32BQ4ueM9CBZjuFAa2O5zLNYlrBM8Uhem15C81Id7c 6fKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=X3DFMiow; 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.56; Tue, 26 Nov 2019 05:48: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=X3DFMiow; 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 S1727820AbfKZNs4 (ORCPT + 15 others); Tue, 26 Nov 2019 08:48:56 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:40062 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727807AbfKZNs4 (ORCPT ); Tue, 26 Nov 2019 08:48:56 -0500 Received: by mail-wr1-f67.google.com with SMTP id 4so19254199wro.7 for ; Tue, 26 Nov 2019 05:48:54 -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=KNL8F99/kiNCZPUhXHP/twsEU6K48GLn40QObRuuXis=; b=X3DFMiowMaSdpJk3f01zYca8OUThUX+8MLB8msP2xsLVyrnbqJnvPUU77S89aF4RMq oobcJ5dYxxY9XKpalvMamOdTAGfUhHwhZUHvkNoEs3JrEdV6vXzmrxCLvxCAm7BnExH2 5IwOdIEqk1sB1Ok5rroONtYiTBzP+rNUs1IfV+Tr083nuOUnpW0DW2hypTis2lrHCvEr c0joYCaFfjQEE22jdlSc4/BL4ni/c01yb3wm6Rm+yR1c7/Tak90heERrTxbWDVzuZXwh si3w01O/shO1jE/6bdUtVzDzKIdzs2UJHBmUhdLgHvXKj0hov4paqbXMPF8iasp+9GED Qj9Q== 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=KNL8F99/kiNCZPUhXHP/twsEU6K48GLn40QObRuuXis=; b=fI7oXK79+8i5g95wPNPbS1cO+Fu9OFa8jqYc2XkFy6S3xeJEBJJr/8WfNHt14acSFf bhIDsqDTcKaBXPhssEGXWhLzu2w875clVy0EVX8o7LO6aSjXy0B0cdHUdkz3GSZ8zUBp i427mNgk493p80/ftDlUmA7f7zDhoi60qZYVJgwvA4gbAi6B8tnySmqR03tpGbFtDJnT nydcr4IHgCf3M7btpYmdGQq2+mmuw7zY7Tr05IWS8LzqKUIfmnu1FsscMIM09iBvJ1Bw oiUxdWAghqn1bwjAxwB5WWp943Y8XIclE8xCeJp74eT851h/8D5m9mIHC5b0LghNkwiv sESA== X-Gm-Message-State: APjAAAVZix6aFUCieszzF2Y33zCBQEYdQk8N9PMwSmy1AObbOleCZksq jQrpB/QQ4Cf4Fg9LRfZNRP88O7XdcwA= X-Received: by 2002:adf:f34c:: with SMTP id e12mr22258365wrp.184.1574776133314; Tue, 26 Nov 2019 05:48:53 -0800 (PST) Received: from localhost.localdomain ([95.149.164.72]) by smtp.gmail.com with ESMTPSA id m9sm14374131wro.66.2019.11.26.05.48.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 05:48:52 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.19 5/5] ocfs2: remove ocfs2_is_o2cb_active() Date: Tue, 26 Nov 2019 13:48:30 +0000 Message-Id: <20191126134830.12747-5-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191126134830.12747-1-lee.jones@linaro.org> References: <20191126134830.12747-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 22ee66ccece0e779fa67c9e7266b926bbc5e903e ] 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 */