From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F5BBC433F5 for ; Fri, 19 Nov 2021 14:34:57 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C811161265 for ; Fri, 19 Nov 2021 14:34:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C811161265 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.ozlabs.org Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4HwfMM3gXtz3bXP for ; Sat, 20 Nov 2021 01:34:55 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=xU3ACvoN; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linuxfoundation.org (client-ip=198.145.29.99; helo=mail.kernel.org; envelope-from=gregkh@linuxfoundation.org; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=xU3ACvoN; dkim-atps=neutral Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4HwfMH5RX2z2ywv for ; Sat, 20 Nov 2021 01:34:51 +1100 (AEDT) Received: by mail.kernel.org (Postfix) with ESMTPSA id 449EF61549; Fri, 19 Nov 2021 14:34:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1637332489; bh=hoLAqjJwU3gztNHhWS64DUcES5bqMwQ7NkVCbE52Ops=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=xU3ACvoNqjQnJb7DM0QkD5Z733a5qvMBdFxidk26h6ueSsYiXrpfpF5nX/h1VhIOA egPek7MbASoBwUBr8Fx0nE45RLAWnn42YVbPUnvuh9j4LXrXmcWN+YVVhKQwcdyb8u ujXhwQBnf01/6b1TY3YnyKGQkcRv3V3qMXMeOhCo= Subject: Patch "erofs: remove the occupied parameter from z_erofs_pagevec_enqueue()" has been added to the 5.4-stable tree To: gregkh@linuxfoundation.org, hsiangkao@linux.alibaba.com, huyue2@yulong.com, linux-erofs@lists.ozlabs.org, xiang@kernel.org From: Date: Fri, 19 Nov 2021 15:34:39 +0100 In-Reply-To: <20211116011035.124503-1-hsiangkao@linux.alibaba.com> Message-ID: <1637332479250251@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore X-BeenThere: linux-erofs@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development of Linux EROFS file system List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stable-commits@vger.kernel.org Errors-To: linux-erofs-bounces+linux-erofs=archiver.kernel.org@lists.ozlabs.org Sender: "Linux-erofs" This is a note to let you know that I've just added the patch titled erofs: remove the occupied parameter from z_erofs_pagevec_enqueue() to the 5.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: erofs-remove-the-occupied-parameter-from-z_erofs_pagevec_enqueue.patch and it can be found in the queue-5.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From foo@baz Fri Nov 19 03:25:57 PM CET 2021 From: Gao Xiang Date: Tue, 16 Nov 2021 09:10:34 +0800 Subject: erofs: remove the occupied parameter from z_erofs_pagevec_enqueue() To: Greg Kroah-Hartman , stable@vger.kernel.org Cc: linux-erofs@lists.ozlabs.org, Yue Hu , Gao Xiang , Gao Xiang Message-ID: <20211116011035.124503-1-hsiangkao@linux.alibaba.com> From: Yue Hu commit 7dea3de7d384f4c8156e8bd93112ba6db1eb276c upstream. No any behavior to variable occupied in z_erofs_attach_page() which is only caller to z_erofs_pagevec_enqueue(). Link: https://lore.kernel.org/r/20210419102623.2015-1-zbestahu@gmail.com Signed-off-by: Yue Hu Reviewed-by: Gao Xiang Signed-off-by: Gao Xiang Signed-off-by: Gao Xiang Signed-off-by: Greg Kroah-Hartman --- fs/erofs/zdata.c | 4 +--- fs/erofs/zpvec.h | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) --- a/fs/erofs/zdata.c +++ b/fs/erofs/zdata.c @@ -292,7 +292,6 @@ static int z_erofs_attach_page(struct z_ enum z_erofs_page_type type) { int ret; - bool occupied; /* give priority for inplaceio */ if (clt->mode >= COLLECT_PRIMARY && @@ -300,8 +299,7 @@ static int z_erofs_attach_page(struct z_ z_erofs_try_inplace_io(clt, page)) return 0; - ret = z_erofs_pagevec_enqueue(&clt->vector, - page, type, &occupied); + ret = z_erofs_pagevec_enqueue(&clt->vector, page, type); clt->cl->vcnt += (unsigned int)ret; return ret ? 0 : -EAGAIN; --- a/fs/erofs/zpvec.h +++ b/fs/erofs/zpvec.h @@ -107,10 +107,8 @@ static inline void z_erofs_pagevec_ctor_ static inline bool z_erofs_pagevec_enqueue(struct z_erofs_pagevec_ctor *ctor, struct page *page, - enum z_erofs_page_type type, - bool *occupied) + enum z_erofs_page_type type) { - *occupied = false; if (!ctor->next && type) if (ctor->index + 1 == ctor->nr) return false; @@ -125,7 +123,6 @@ static inline bool z_erofs_pagevec_enque /* should remind that collector->next never equal to 1, 2 */ if (type == (uintptr_t)ctor->next) { ctor->next = page; - *occupied = true; } ctor->pages[ctor->index++] = tagptr_fold(erofs_vtptr_t, page, type); return true; Patches currently in stable-queue which might be from hsiangkao@linux.alibaba.com are queue-5.4/erofs-fix-unsafe-pagevec-reuse-of-hooked-pclusters.patch queue-5.4/erofs-remove-the-occupied-parameter-from-z_erofs_pagevec_enqueue.patch