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

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

nfs: fix v4.2 SEEK on files over 2 gigs 



We're incorrectly assigning a loff_t return to an int.  If SEEK_HOLE or
SEEK_DATA returns an offset over 2^31 then the application will see a
weird lseek() result (usually -EIO).

Cc: stable@vger.kernel.org
Fixes: bdcc2cd1 "NFSv4.2: handle NFS-specific llseek errors"
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Reviewed-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 03c78827

fs/nfs/nfs42proc.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -175,10 +175,12 @@ loff_t nfs42_proc_llseek(struct file *filep, loff_t offset, int whence) 
{

{

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

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

	struct nfs4_exception exception = { };

	struct nfs4_exception exception = { };

	int err;

	loff_t err;





	do {

	do {

		err = _nfs42_proc_llseek(filep, offset, whence);

		err = _nfs42_proc_llseek(filep, offset, whence);

		if (err >= 0)

			break;

		if (err == -ENOTSUPP)

		if (err == -ENOTSUPP)

			return -EOPNOTSUPP;

			return -EOPNOTSUPP;

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

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