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

Commit 2d89a1d3 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.1/pNFS: Don't request a minimal read layout beyond the end of file 



If we have a read layout, then sanity check the minimal layout length
so that it does not extend beyond the end of file.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 21b874c8

fs/nfs/pnfs.c

+9 −0
Original line number Diff line number Diff line
@@ -868,6 +868,7 @@ send_layoutget(struct pnfs_layout_hdr *lo, 
	struct nfs_server *server = NFS_SERVER(ino);

	struct nfs4_layoutget *lgp;

	struct pnfs_layout_segment *lseg;

	loff_t i_size;



	dprintk("--> %s\n", __func__);
@@ -875,9 +876,17 @@ send_layoutget(struct pnfs_layout_hdr *lo, 
	if (lgp == NULL)

		return NULL;



	i_size = i_size_read(ino);



	lgp->args.minlength = PAGE_CACHE_SIZE;

	if (lgp->args.minlength > range->length)

		lgp->args.minlength = range->length;

	if (range->iomode == IOMODE_READ) {

		if (range->offset >= i_size)

			lgp->args.minlength = 0;

		else if (i_size - range->offset < lgp->args.minlength)

			lgp->args.minlength = i_size - range->offset;

	}

	lgp->args.maxcount = PNFS_LAYOUT_MAXSIZE;

	lgp->args.range = *range;

	lgp->args.type = server->pnfs_curr_ld->id;