Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2460217imj; Mon, 18 Feb 2019 06:25:33 -0800 (PST) X-Google-Smtp-Source: AHgI3IbPP4FI3dBDFtKdkm6lxNOdVwcGF3l1c+AaOdAS/uXyf8+rW7EvxvrCpP5Nask5NX5Szk0c X-Received: by 2002:a65:51ca:: with SMTP id i10mr22482468pgq.371.1550499933278; Mon, 18 Feb 2019 06:25:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550499933; cv=none; d=google.com; s=arc-20160816; b=XNxP2uL6aVmHIQIaTbdNgiQlh1u3Fg18d9tzQv8RLUOVojErRiTF9pZr354D0rurw9 cK1rlXBcTp9RgfK+nzwkDPPFzTOsETASJo+yelJ5DXqIf4b2i8XSTve/zF44xnl3J1xO IsI41ah6cvi7fPxK24rWgFVmDgPxGrSzOrhJPGzjmh6jK6T4v9O7adA3p/W4jWbXSnoY EPmLV4ljeGXBs35J9H686C5pZ3rDP/ERkdd/JiJ6NumRkJbb9pbIQD7dvv1tkkA89U2Q Uvde3h/qVVkMwD+/Yh9RjJpYdtlW7k3vnqx4Vla3ozmi0/2wg5QgY3j1UlH0q+hu/ad+ qLmg== 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=71G1T94VW6/WnjyIj3uvSpiMuBWD7+52It9xDx89OhU=; b=uqsjxFWPXMKBVagc4csEzi5ighSydDnm+ZdggBt7b4Rt2Qm99ZamTnRcZy5sIZXvtU wX58KrpNgWcTlH0g9vmp5G2Ci9/7M/XY6dp1sdtZgjym7lSe8ZK+zqJuwBMCbO4igXD1 wFrRrEIuIgjB/h2COqRX0C5Zo7gDJSMIUB2PqwnjNq+Bq8S9N+rhioHUvNfQjUZ9YKfe qhlFUnwWA8uQ8o5BjW/LWLjSqLlh0HNdag+1Jn6a2cJabIKp6mGLLGy3n1fE7cgCNk0k pcB569x1pM7LQhtjGz1fCFENzOpb2aiou4FYJc1+iBKGy7rR4aw0qWie6cJVM/prkd57 JALQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=S3W+NtOD; 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 u77si14903114pfj.139.2019.02.18.06.25.16; Mon, 18 Feb 2019 06:25:33 -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=S3W+NtOD; 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 S2389972AbfBROEl (ORCPT + 99 others); Mon, 18 Feb 2019 09:04:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:47134 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389002AbfBROEi (ORCPT ); Mon, 18 Feb 2019 09:04:38 -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 88B3E21901; Mon, 18 Feb 2019 14:04:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550498678; bh=4C/lufUo4iMYPZ4ykF0iA1wOBaYOYy1ZMroD57Q4MRU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S3W+NtODcVQjvE/nnAGlX2nDy37W9oA/2COR44m4Qe9AwC+4oBRDFGUfVYol0Cm3p NmwNGEh8f0LjIx2gmevrJkhai1IL9xaM0lj3OYOiY5Qxk63Qeqqfq858pxWW6ocAjk rwt9X0owHlM3z2gOMVLzTqwr7dU5QXdFJyl57K5A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Miklos Szeredi Subject: [PATCH 4.4 086/143] fuse: decrement NR_WRITEBACK_TEMP on the right page Date: Mon, 18 Feb 2019 14:43:34 +0100 Message-Id: <20190218133532.208764580@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133529.099444112@linuxfoundation.org> References: <20190218133529.099444112@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.4-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 @@ -1784,7 +1784,7 @@ static bool fuse_writepage_in_flight(str spin_unlock(&fc->lock); dec_wb_stat(&bdi->wb, WB_WRITEBACK); - dec_zone_page_state(page, NR_WRITEBACK_TEMP); + dec_zone_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);