diff options
| author | Olga Kornievskaia <olga.kornievskaia@gmail.com> | 2019-01-11 19:04:44 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-31 06:46:03 -0700 |
| commit | e1eed6928b3ee66a1ac63c7d3eebc63066d59730 (patch) | |
| tree | bc86871ac4098427770c795aa48ea120625bf80f /fs/nfs | |
| parent | 0bad28e92cedae48f95bc625f9d56109651a9c0f (diff) | |
| download | linux-stable-e1eed6928b3ee66a1ac63c7d3eebc63066d59730.tar.gz linux-stable-e1eed6928b3ee66a1ac63c7d3eebc63066d59730.tar.bz2 linux-stable-e1eed6928b3ee66a1ac63c7d3eebc63066d59730.zip | |
NFSv4.2 fix unnecessary retry in nfs4_copy_file_range
commit 45ac486ecf2dc998e25cf32f0cabf2deaad875be upstream.
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>
Cc: Yu Xu <xuyu@linux.alibaba.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/nfs')
| -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 4288a6ecaf75..31dac3f2033f 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) |