From patchwork Fri Feb 13 21:19:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haynes X-Patchwork-Id: 5827831 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8E7249F7C4 for ; Fri, 13 Feb 2015 21:20:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CC3C2201EF for ; Fri, 13 Feb 2015 21:20:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E8643201F5 for ; Fri, 13 Feb 2015 21:20:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752665AbbBMVUI (ORCPT ); Fri, 13 Feb 2015 16:20:08 -0500 Received: from mail-pd0-f176.google.com ([209.85.192.176]:45000 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752378AbbBMVUH (ORCPT ); Fri, 13 Feb 2015 16:20:07 -0500 Received: by pdbnh10 with SMTP id nh10so17576173pdb.11 for ; Fri, 13 Feb 2015 13:20:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tah9oKl08hX7TwCFSYygdritQVdO3n8xg6ykwIMI+18=; b=Fyk74OiZsyo0KbCydMhkC2dxEzKDVI6cAP2AEMyIOhz4BQaejibNtGdc0nPuA9eOLF HmTiImSkfaAcxd7dCqsjFYbT/IyvICP9W5iMR5AS63xwAFkBJaBCfIa3pesBmUFW7TKs QzgCZ9IrezUCpc6nMIujw8d/0isHmMgJDzr0GaqIeBjrEGO4E8siaiauGrsWg6Yi6W0m Nc+8n2d1myj1YVXjLudSIjiY5YYyGMtGreBzE5jDYNed1ur+aIPdraYeemaU27Mcfyka dxg2+vpYvUaMDikRgQGl9myCHPAi5+3N5hg6DaZuneSo1+flPdM7i1nKr1wBvRbzyeYF 5o1g== X-Gm-Message-State: ALoCoQmXwUcH1b1DM+AmziSbtapAbxk/6wuqH7DZVZwHO1WvVxAuc2ymGpMQ0w+LBC3x445jIvT/ X-Received: by 10.70.42.206 with SMTP id q14mr1031583pdl.141.1423862406869; Fri, 13 Feb 2015 13:20:06 -0800 (PST) Received: from localhost.localdomain ([50.242.95.105]) by mx.google.com with ESMTPSA id qm12sm7616300pdb.36.2015.02.13.13.20.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Feb 2015 13:20:06 -0800 (PST) From: Tom Haynes X-Google-Original-From: Tom Haynes To: Trond Myklebust , Anna Schumaker Cc: Linux NFS Mailing list Subject: [PATCH v2 2/2] nfs: Can call nfs_clear_page_commit() instead Date: Fri, 13 Feb 2015 13:19:54 -0800 Message-Id: <1423862394-74977-3-git-send-email-loghyr@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1423862394-74977-1-git-send-email-loghyr@primarydata.com> References: <1423862394-74977-1-git-send-email-loghyr@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Tom Haynes --- fs/nfs/write.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 76c278a..595d81e 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -1600,11 +1600,8 @@ void nfs_retry_commit(struct list_head *page_list, req = nfs_list_entry(page_list->next); nfs_list_remove_request(req); nfs_mark_request_commit(req, lseg, cinfo, ds_commit_idx); - if (!cinfo->dreq) { - dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); - dec_bdi_stat(inode_to_bdi(page_file_mapping(req->wb_page)->host), - BDI_RECLAIMABLE); - } + if (!cinfo->dreq) + nfs_clear_page_commit(req->wb_page); nfs_unlock_and_release_request(req); } }