Commit a60214c2 authored by Anna Schumaker's avatar Anna Schumaker Committed by Trond Myklebust
Browse files

NFS: Allow very small rsize & wsize again 



940261a1 introduced nfs_io_size() to clamp the iosize to a multiple
of PAGE_SIZE. This had the unintended side effect of no longer allowing
iosizes less than a page, which could be useful in some situations.

UDP already has an exception that causes it to fall back on the
power-of-two style sizes instead. This patch adds an additional
exception for very small iosizes.

Reported-by: default avatarJeff Layton <jlayton@kernel.org>
Fixes: 940261a1 ("NFS: Allow setting rsize / wsize to a multiple of PAGE_SIZE")
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent f8527028

fs/nfs/internal.h

+2 −4
Original line number Diff line number Diff line
@@ -739,12 +739,10 @@ unsigned long nfs_io_size(unsigned long iosize, enum xprt_transports proto) 
		iosize = NFS_DEF_FILE_IO_SIZE;

	else if (iosize >= NFS_MAX_FILE_IO_SIZE)

		iosize = NFS_MAX_FILE_IO_SIZE;

	else

		iosize = iosize & PAGE_MASK;



	if (proto == XPRT_TRANSPORT_UDP)

	if (proto == XPRT_TRANSPORT_UDP || iosize < PAGE_SIZE)

		return nfs_block_bits(iosize, NULL);

	return iosize;

	return iosize & PAGE_MASK;

}



/*