From: Christoph Hellwig Date: Thu, 21 Aug 2014 16:09:26 +0000 (-0500) Subject: pnfs/blocklayout: reject pnfs blocksize larger than page size X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e3aaf7f2b8e9e858c0d6626577d3456bf6070e5a;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git pnfs/blocklayout: reject pnfs blocksize larger than page size The Linux VM subsystem can't support block sizes larger than page size for block based filesystems very well. While this can be hacked around to some extent for simple filesystems the read-modify-write cycles required for pnfs block invalid extents are extremly deadlock prone when operating on multiple pages. Reject this case early on instead of pretending to support it (badly). Signed-off-by: Christoph Hellwig Signed-off-by: Trond Myklebust --- diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c index cbb1797149d5..6c1a4212919d 100644 --- a/fs/nfs/blocklayout/blocklayout.c +++ b/fs/nfs/blocklayout/blocklayout.c @@ -1115,6 +1115,12 @@ bl_set_layoutdriver(struct nfs_server *server, const struct nfs_fh *fh) dprintk("%s Server did not return blksize\n", __func__); return -EINVAL; } + if (server->pnfs_blksize > PAGE_SIZE) { + printk(KERN_ERR "%s: pNFS blksize %d not supported.\n", + __func__, server->pnfs_blksize); + return -EINVAL; + } + b_mt_id = kzalloc(sizeof(struct block_mount_id), GFP_NOFS); if (!b_mt_id) { status = -ENOMEM;