From patchwork Mon Jul 8 09:52:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konstantin Khlebnikov X-Patchwork-Id: 2824773 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BE2CDC0AB2 for ; Mon, 8 Jul 2013 09:53:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 83B4A2015F for ; Mon, 8 Jul 2013 09:53:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9857C20155 for ; Mon, 8 Jul 2013 09:53:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752520Ab3GHJwM (ORCPT ); Mon, 8 Jul 2013 05:52:12 -0400 Received: from mail-la0-f49.google.com ([209.85.215.49]:48561 "EHLO mail-la0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751305Ab3GHJwK (ORCPT ); Mon, 8 Jul 2013 05:52:10 -0400 Received: by mail-la0-f49.google.com with SMTP id ea20so3579672lab.36 for ; Mon, 08 Jul 2013 02:52:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=oCHhBqPgVpljMnURJLhu/OMC1uYkjryBbltEF5Dyvus=; b=BoRzr6CXpkgbZXCQ1SGAofPj+fXzQGyPoo3hXJlI4TIYiOqqo1W+BNv8WVU6w5+kSy BZD/0ejzhADZupXrqIXn1k2QhFHVi60tBJId0C/nxzkCF1hrds44dNTLXFOPvYLQDR4j k9mVyXv5eTBOm+E9in4zFXBCHCLdOOb0wljYAk8e/xscSxqizsLaxz649wQdheQls9QQ Fd+px/QNJ6eQIqBTsqN8k+Qju1e/t4UtlxN7FUEPITYdQ8bPVxchfd4Bl1a4l4A6Lfc9 +W8gck62wXZGfgaQvVEPjZ8TwloxPPJEL8lOQb2RfBaOpsnyV9Uugy5296y6D1P0j7Sg Knqw== X-Received: by 10.112.19.162 with SMTP id g2mr10513438lbe.9.1373277129046; Mon, 08 Jul 2013 02:52:09 -0700 (PDT) Received: from localhost (swsoft-msk-nat.sw.ru. [195.214.232.10]) by mx.google.com with ESMTPSA id e5sm7124702lbw.3.2013.07.08.02.52.07 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 08 Jul 2013 02:52:08 -0700 (PDT) Subject: [PATCH 2/5] nfs: remove redundant cancel_dirty_page() from nfs_wb_page_cancel() To: linux-mm@kvack.org, Andrew Morton From: Konstantin Khlebnikov Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 08 Jul 2013 13:52:06 +0400 Message-ID: <20130708095206.13810.31538.stgit@zurg> In-Reply-To: <20130708095202.13810.11659.stgit@zurg> References: <20130708095202.13810.11659.stgit@zurg> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 This chunk was added by commit 1b3b4a1a2deb7d3e5d66063bd76304d840c966b3 ("NFS: Fix a write request leak in nfs_invalidate_page()") in kernel 2.6.23, as fix for problem introduced in commit 3e67c0987d7567ad666641164a153dca9a43b11d ("[PATCH] truncate: clear page dirtiness before running try_to_free_buffers()") in v2.6.20, which has placed cancel_dirty_page() in truncate_complete_page() before calling do_invalidatepage(). But that change in truncate_complete_page() was reverted by commit a2b345642f530054a92b8d2b5108436225a8093e in v2.6.25 ("Fix dirty page accounting leak with ext3 data=journal"). Signed-off-by: Konstantin Khlebnikov Cc: linux-nfs@vger.kernel.org --- fs/nfs/write.c | 5 ----- 1 file changed, 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/nfs/write.c b/fs/nfs/write.c index a2c7c28..737981f 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -1735,11 +1735,6 @@ int nfs_wb_page_cancel(struct inode *inode, struct page *page) if (nfs_lock_request(req)) { nfs_clear_request_commit(req); nfs_inode_remove_request(req); - /* - * In case nfs_inode_remove_request has marked the - * page as being dirty - */ - cancel_dirty_page(page, PAGE_CACHE_SIZE); nfs_unlock_and_release_request(req); break; }