From: ChenXiaoSong <chenxiaosong2@huawei.com>
Date: Thu, 23 Jun 2022 01:58:58 +0000 (+0800)
Subject: NFS: remove redundant code in nfs_file_write()
X-Git-Tag: v6.0-rc1~38^2~37
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=064109db53ecc5d88621d02f36da9f33ca0d64bd;p=tomoyo%2Ftomoyo-test1.git

NFS: remove redundant code in nfs_file_write()

filemap_fdatawait_range() will always return 0, after patch 6c984083ec24
("NFS: Use of mapping_set_error() results in spurious errors"), it will not
save the wb err in struct address_space->flags:

  result = filemap_fdatawait_range(file->f_mapping, ...) = 0
    filemap_check_errors(mapping) = 0
      test_bit(..., &mapping->flags) // flags is 0

Signed-off-by: ChenXiaoSong <chenxiaosong2@huawei.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
---

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 2d72b1b7ed74..54237a231687 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -663,8 +663,6 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
 		result = filemap_fdatawait_range(file->f_mapping,
 						 iocb->ki_pos - written,
 						 iocb->ki_pos - 1);
-		if (result < 0)
-			goto out;
 	}
 	result = generic_write_sync(iocb, written);
 	if (result < 0)