Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2727932imj; Mon, 11 Feb 2019 07:36:02 -0800 (PST) X-Google-Smtp-Source: AHgI3IZD8y/uGC3IPiVH9SbQYTmaP+vgVvfCctUdJG76HyKIZS/0GrVcNRID9JbRdPqR7ujSgv3I X-Received: by 2002:a63:4384:: with SMTP id q126mr33686635pga.160.1549899362809; Mon, 11 Feb 2019 07:36:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549899362; cv=none; d=google.com; s=arc-20160816; b=FfE4agSRt+Xz0pK+8QKruFQXJLToHL9dAjwQKHLq/Xs59AoIr5f46vVXAuDM2wbE8+ vmMzVhVj3C1LHoLmEi0a2GGgYsdoXi2HmPnOt3eoflX2wAur2TRbz9gTzQS88W/nBze6 VdSgsTCn+AgIJccv0f0KJ67xp/L1DFrh6P5dde0ryotGJ0n6hKMrC9GLwTJLSKgXjwNC mUNzciuSCFbRLYXZvG2AywNVxT+nVChMuGt4xR+ETmLTJKFRRgUXpkBEPxkVWrut9aaP dDXLCOnDWIKiKURTkIAozY38ykE1etJ00FDbnJRG/O3Zdak13lNzRaa62G5PEgcj6wB0 WyDA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=oLaSTopMhMU9Ju+gigRm2EXd/EK9NuiIGNVCfNX1WgI=; b=K8eSSciye3OFDRXpRAgVxjPytPqZm8KcEiLitsCCqpwU3LhjCOlfRThTBdv6SB6HId ThRz8fEtn5aAR0FZJEmUV/gObzhVaSNzlcRfeS8Zf+VrvvEO2B8LKGFtWbOdxd7Jle4f wJNP5zuxT62Gmy65aXAucozeVPfYC0FXa7aVoKHi+InvUnJ+CWqWLtp/A7WNw04CXjRr Bl8gAAknUvnj+nNqDX2VZsQgJYOBSmFawN8W0pWjPNs3XkV4EYiuyc0yj7AXn49Man/c U0YnTh/yMeNsnbxxlLEvEeFqLhXyFSyr0sfWUJisxXXoulEs1NJP7LPRfjJ3u8RbvyQk t6+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=oYMOQe0V; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q6si2912588pgq.442.2019.02.11.07.35.46; Mon, 11 Feb 2019 07:36:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=@kernel.org header.s=default header.b=oYMOQe0V; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388581AbfBKOxM (ORCPT + 99 others); Mon, 11 Feb 2019 09:53:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:39568 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388570AbfBKOxK (ORCPT ); Mon, 11 Feb 2019 09:53:10 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 53C0E20700; Mon, 11 Feb 2019 14:53:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549896789; bh=biPaV/zBGFztGoddLFvdf2PO9sw8+NSDl0p4StsAwhw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oYMOQe0Vu19fACuJk/b5m9LtR4r8mOi3RcdV5IwS6/i9sCWW1wjQYBKT4oL+UR4Z/ 5G74kfUFdLLME3fUGwAvQ/mmDYDxAa3JHPqAGU0MaNpkHnkJdlx+RHeWqRassZw3Wn tYTOaCM7I8I0fn/RlhOrN5UNDOoS+TCtUo+t/0Vg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Miklos Szeredi Subject: [PATCH 4.19 285/313] fuse: decrement NR_WRITEBACK_TEMP on the right page Date: Mon, 11 Feb 2019 15:19:25 +0100 Message-Id: <20190211141912.219775406@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141852.749630980@linuxfoundation.org> References: <20190211141852.749630980@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Miklos Szeredi commit a2ebba824106dabe79937a9f29a875f837e1b6d4 upstream. NR_WRITEBACK_TEMP is accounted on the temporary page in the request, not the page cache page. Fixes: 8b284dc47291 ("fuse: writepages: handle same page rewrites") Cc: # v3.13 Signed-off-by: Miklos Szeredi Signed-off-by: Greg Kroah-Hartman --- fs/fuse/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1778,7 +1778,7 @@ static bool fuse_writepage_in_flight(str spin_unlock(&fc->lock); dec_wb_stat(&bdi->wb, WB_WRITEBACK); - dec_node_page_state(page, NR_WRITEBACK_TEMP); + dec_node_page_state(new_req->pages[0], NR_WRITEBACK_TEMP); wb_writeout_inc(&bdi->wb); fuse_writepage_free(fc, new_req); fuse_request_free(new_req);