Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2747814imj; Mon, 11 Feb 2019 07:54:48 -0800 (PST) X-Google-Smtp-Source: AHgI3IYkNVnwVxrn5V5/pJN2eFM2qP41aq1GlYYXiXxj8bHEL+SdcwEpEzmMU7UZWU8bv7yOCf/h X-Received: by 2002:a63:f844:: with SMTP id v4mr28958495pgj.82.1549900488171; Mon, 11 Feb 2019 07:54:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549900488; cv=none; d=google.com; s=arc-20160816; b=lymVRoIDoEuS3dkNIVwrpiwc72c8lVpr1XFViZeJXpOdA0vcMfUbaI54pmY+9DSeLW e4NRvBTs0wjel3fNKMYiWdAySd3M19XdezVsBK1sLcRojC2frowZBiB2chczvgkBAfdi N+PwtytJrKhZC77KNIZNLFGMKMtb2gLjn90VxqmlPadX7LqdY+LpnB/JaE2ALk21Weol Mh9AnOWQfUnFgEw1L83gLfGETmfHh8KcdClGkOLn3440mFzkJtnlk4uUmDs1afLfPSZ6 4i1bspci7J0woIQvfn7WaP8G5glAFSlcNx4reZaiu0ubc6n9ClJtKwVF1ylauEeTIH/k yL1g== 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=vmZEQCNd/ke/1/VUpNzcwzQUMmWCeJKHUf3R8Cvf/Cc=; b=hurfQaPk0/ZFOIkEqvVWSji3q8ox0viGDql0eaGB4YIM2/8hCNQ4GfSmOhAYhUCA7e VH8Zo3qTvYUiJSz+Tn3bR4jwhvNlG3PRJva7uOLqAqCMn3hkalHcwD6vvNihZ7HtIQv+ ztkHg3anpzFeBQiwm0vIJbgc8Jyn3z6uAF0Ey6ZXNXW0Y2prt6a1cM2fCYkXyiNJOwrC Q7U5U9flk1iWv58W+ZncJHfvKDnenxbXwI1bXOgvgoPkVb8sUmUOBlbQjNJvW6VUsnVw cgblydDFVruFoOXhf9fho/vH6ZCdVB6XxoJ3kNCGmpo+t9wjqpdT67KVdTPVOFRTrodw SiDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QJ7tocLz; 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 i10si2306800plb.188.2019.02.11.07.54.31; Mon, 11 Feb 2019 07:54:48 -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=QJ7tocLz; 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 S1731247AbfBKOg1 (ORCPT + 99 others); Mon, 11 Feb 2019 09:36:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:45390 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730383AbfBKOgV (ORCPT ); Mon, 11 Feb 2019 09:36:21 -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 E058320700; Mon, 11 Feb 2019 14:36:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549895781; bh=S9ZU50Us0aiowbJCNg2cE8aEg7nvx8Y2AVMFpMsfzGI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QJ7tocLziKn7OyxtLfIB7cJ7lnFcsJ3pflGhG0e9kTjfZ2rN21m8/zuK9lGuBsP+t 0ha6SoLYAMQjHG3JjK7gTMVruhyvVsbt83ULVxcirIoRmUi6dEY8AMAO3XSXuvEBcv B8wBMUKZGQMRv3/wNSMrANPKCAOu68KQCy+JE43I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Miklos Szeredi Subject: [PATCH 4.20 321/352] fuse: decrement NR_WRITEBACK_TEMP on the right page Date: Mon, 11 Feb 2019 15:19:08 +0100 Message-Id: <20190211141907.243470004@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141846.543045703@linuxfoundation.org> References: <20190211141846.543045703@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.20-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 @@ -1782,7 +1782,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);