summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-10-13 21:31:03 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-10-13 21:31:03 +0300
commit5b5f1455272e23f4e7889cec37228802d8d01adf (patch)
treebaee6044c8936bf7a9ddbb524f9d31bafb81da19 /fs
parent6006d4521b158e5ef48620e8c9028bba91bf985d (diff)
parent3be7f32878e742cf3c17b435c90e198862457706 (diff)
downloadlinux-5b5f1455272e23f4e7889cec37228802d8d01adf.tar.xz
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
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/blocklayout.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c
index cdefaa331a07..c29d9421bd5e 100644
--- a/fs/nfsd/blocklayout.c
+++ b/fs/nfsd/blocklayout.c
@@ -56,14 +56,6 @@ nfsd4_block_proc_layoutget(struct inode *inode, const struct svc_fh *fhp,
u32 device_generation = 0;
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)) {
dprintk("pnfsd: I/O misaligned\n");
goto out_layoutunavailable;