Merge branch 'bjorn.button' into release

[pandora-kernel.git] / fs / nfs / file.c

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 3523b89..5a97bcf 100644 (file)
--- 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)