summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorOlga Kornievskaia <kolga@netapp.com>2021-03-31 15:30:25 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-22 10:59:43 +0200
commit28a55a8a49f4ae334a8a6d4c1ad429ff7978bb4f (patch)
tree3e1a17dc572f1d4f766e260bedc0029ca9f0cb74 /fs/nfs
parentf27638a92f77d8107efbaf48a0d3bfa24da8cdad (diff)
downloadlinux-stable-28a55a8a49f4ae334a8a6d4c1ad429ff7978bb4f.tar.gz
linux-stable-28a55a8a49f4ae334a8a6d4c1ad429ff7978bb4f.tar.bz2
linux-stable-28a55a8a49f4ae334a8a6d4c1ad429ff7978bb4f.zip
NFSv4.2 fix handling of sr_eof in SEEK's reply
[ Upstream commit 73f5c88f521a630ea1628beb9c2d48a2e777a419 ] Currently the client ignores the value of the sr_eof of the SEEK operation. According to the spec, if the server didn't find the requested extent and reached the end of the file, the server would return sr_eof=true. In case the request for DATA and no data was found (ie in the middle of the hole), then the lseek expects that ENXIO would be returned. Fixes: 1c6dcbe5ceff8 ("NFS: Implement SEEK") Signed-off-by: Olga Kornievskaia <kolga@netapp.com> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs42proc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
index da7b73ad811f..be252795a6f7 100644
--- a/fs/nfs/nfs42proc.c
+++ b/fs/nfs/nfs42proc.c
@@ -500,7 +500,10 @@ static loff_t _nfs42_proc_llseek(struct file *filep,
if (status)
return status;
- return vfs_setpos(filep, res.sr_offset, inode->i_sb->s_maxbytes);
+ if (whence == SEEK_DATA && res.sr_eof)
+ return -NFS4ERR_NXIO;
+ else
+ return vfs_setpos(filep, res.sr_offset, inode->i_sb->s_maxbytes);
}
loff_t nfs42_proc_llseek(struct file *filep, loff_t offset, int whence)