diff options
| author | Olga Kornievskaia <olga.kornievskaia@gmail.com> | 2019-01-12 01:04:44 +0100 |
|---|---|---|
| committer | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2019-01-15 17:24:49 +0100 |
| commit | 45ac486ecf2dc998e25cf32f0cabf2deaad875be (patch) | |
| tree | 0a99fcde68a6e23eb5a41332cb18a6322ec29a6c /fs/nfs/nfs4file.c | |
| parent | sunrpc: kernel BUG at kernel/cred.c:825! (diff) | |
| download | linux-45ac486ecf2dc998e25cf32f0cabf2deaad875be.tar.xz linux-45ac486ecf2dc998e25cf32f0cabf2deaad875be.zip | |
NFSv4.2 fix unnecessary retry in nfs4_copy_file_range
Currently nfs42_proc_copy_file_range() can not return EAGAIN.
Fixes: e4648aa4f98a ("NFS recover from destination server reboot for copies")
Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'fs/nfs/nfs4file.c')
| -rw-r--r-- | fs/nfs/nfs4file.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c index 46d691ba04bc..45b2322e092d 100644 --- a/fs/nfs/nfs4file.c +++ b/fs/nfs/nfs4file.c @@ -133,15 +133,9 @@ static ssize_t nfs4_copy_file_range(struct file *file_in, loff_t pos_in, struct file *file_out, loff_t pos_out, size_t count, unsigned int flags) { - ssize_t ret; - if (file_inode(file_in) == file_inode(file_out)) return -EINVAL; -retry: - ret = nfs42_proc_copy(file_in, pos_in, file_out, pos_out, count); - if (ret == -EAGAIN) - goto retry; - return ret; + return nfs42_proc_copy(file_in, pos_in, file_out, pos_out, count); } static loff_t nfs4_file_llseek(struct file *filep, loff_t offset, int whence) |