Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdcc2cd1 authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Trond Myklebust
Browse files

NFSv4.2: handle NFS-specific llseek errors 



Handle NFS-specific llseek errors instead of letting them leak out to
userspace.

Reported-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent d4c30454

fs/nfs/nfs42proc.c

+18 −1
Original line number Original line Diff line number Diff line
@@ -135,7 +135,7 @@ int nfs42_proc_deallocate(struct file *filep, loff_t offset, loff_t len) 
	return err;

	return err;

}

}





loff_t nfs42_proc_llseek(struct file *filep, loff_t offset, int whence)

static loff_t _nfs42_proc_llseek(struct file *filep, loff_t offset, int whence)

{

{

	struct inode *inode = file_inode(filep);

	struct inode *inode = file_inode(filep);

	struct nfs42_seek_args args = {

	struct nfs42_seek_args args = {
@@ -171,6 +171,23 @@ loff_t nfs42_proc_llseek(struct file *filep, loff_t offset, int whence) 
	return vfs_setpos(filep, res.sr_offset, inode->i_sb->s_maxbytes);

	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)

{

	struct nfs_server *server = NFS_SERVER(file_inode(filep));

	struct nfs4_exception exception = { };

	int err;



	do {

		err = _nfs42_proc_llseek(filep, offset, whence);

		if (err == -ENOTSUPP)

			return -EOPNOTSUPP;

		err = nfs4_handle_exception(server, err, &exception);

	} while (exception.retry);



	return err;

}





static void

static void

nfs42_layoutstat_prepare(struct rpc_task *task, void *calldata)

nfs42_layoutstat_prepare(struct rpc_task *task, void *calldata)

{

{