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

Commit 5b5f1455 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfsd-4.3-2' of git://linux-nfs.org/~bfields/linux 

Pull nfsd fixes from Bruce Fields:
 "Two nfsd fixes, one for an RDMA crash, one for a pnfs/block protocol
  bug"

* tag 'nfsd-4.3-2' of git://linux-nfs.org/~bfields/linux:
  svcrdma: Fix NFS server crash triggered by 1MB NFS WRITE
  nfsd/blocklayout: accept any minlength
parents 6006d452 3be7f328

fs/nfsd/blocklayout.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -56,14 +56,6 @@ nfsd4_block_proc_layoutget(struct inode *inode, const struct svc_fh *fhp, 
	u32 device_generation = 0;

	u32 device_generation = 0;

	int error;

	int error;





	/*

	 * We do not attempt to support I/O smaller than the fs block size,

	 * or not aligned to it.

	 */

	if (args->lg_minlength < block_size) {

		dprintk("pnfsd: I/O too small\n");

		goto out_layoutunavailable;

	}

	if (seg->offset & (block_size - 1)) {

	if (seg->offset & (block_size - 1)) {

		dprintk("pnfsd: I/O misaligned\n");

		dprintk("pnfsd: I/O misaligned\n");

		goto out_layoutunavailable;

		goto out_layoutunavailable;

net/sunrpc/xprtrdma/svc_rdma_recvfrom.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -533,7 +533,7 @@ static int rdma_read_complete(struct svc_rqst *rqstp, 
	rqstp->rq_arg.page_base = head->arg.page_base;

	rqstp->rq_arg.page_base = head->arg.page_base;





	/* rq_respages starts after the last arg page */

	/* rq_respages starts after the last arg page */

	rqstp->rq_respages = &rqstp->rq_arg.pages[page_no];

	rqstp->rq_respages = &rqstp->rq_pages[page_no];

	rqstp->rq_next_page = rqstp->rq_respages + 1;

	rqstp->rq_next_page = rqstp->rq_respages + 1;





	/* Rebuild rq_arg head and tail. */

	/* Rebuild rq_arg head and tail. */