From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760967AbZDGU1s (ORCPT ); Tue, 7 Apr 2009 16:27:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757775AbZDGU1f (ORCPT ); Tue, 7 Apr 2009 16:27:35 -0400 Received: from mx2.netapp.com ([216.240.18.37]:11803 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752384AbZDGU1c (ORCPT ); Tue, 7 Apr 2009 16:27:32 -0400 X-IronPort-AV: E=Sophos;i="4.39,339,1235980800"; d="scan'208";a="151514847" To: Linus Torvalds Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org From: Trond Myklebust Date: Sat, 4 Apr 2009 12:22:57 -0400 Subject: [PATCH] NFS: Fix the return value in nfs_page_mkwrite() Message-Id: <1239135976.5664.0.camel@heimdal.trondhjem.org> Mime-Version: 1.0 X-Mailer: Evolution 2.26.0 X-OriginalArrivalTime: 07 Apr 2009 20:27:19.0550 (UTC) FILETIME=[3FE6D9E0:01C9B7BF] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit c2ec175c39f62949438354f603f4aa170846aabb (mm: page_mkwrite change prototype to match fault) exposed a bug in the NFS implementation of page_mkwrite. We should be returning 0 on success... Signed-off-by: Trond Myklebust --- fs/nfs/file.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 3523b89..5a97bcf 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -516,8 +516,6 @@ static int nfs_vm_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) goto out_unlock; ret = nfs_updatepage(filp, page, 0, pagelen); - if (ret == 0) - ret = pagelen; out_unlock: unlock_page(page); if (ret) -- 1.6.0.4