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

Commit d78471d3 authored by Benjamin Coddington's avatar Benjamin Coddington Committed by Trond Myklebust
Browse files

pnfs/blocklayout: set PNFS_LAYOUTRETURN_ON_ERROR 



If there's an error doing I/O to block device, and the client resends the
I/O to the MDS, the MDS must recall the layout from the client before
processing the I/O.  Let's preempt that exchange by returning the layout
before falling back to the MDS when there's an error.

Signed-off-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent ad6b0241

fs/nfs/blocklayout/blocklayout.c

+2 −0
Original line number Diff line number Diff line
@@ -887,6 +887,7 @@ static struct pnfs_layoutdriver_type blocklayout_type = { 
	.name				= "LAYOUT_BLOCK_VOLUME",

	.owner				= THIS_MODULE,

	.flags				= PNFS_LAYOUTRET_ON_SETATTR |

					  PNFS_LAYOUTRET_ON_ERROR |

					  PNFS_READ_WHOLE_PAGE,

	.read_pagelist			= bl_read_pagelist,

	.write_pagelist			= bl_write_pagelist,
@@ -910,6 +911,7 @@ static struct pnfs_layoutdriver_type scsilayout_type = { 
	.name				= "LAYOUT_SCSI",

	.owner				= THIS_MODULE,

	.flags				= PNFS_LAYOUTRET_ON_SETATTR |

					  PNFS_LAYOUTRET_ON_ERROR |

					  PNFS_READ_WHOLE_PAGE,

	.read_pagelist			= bl_read_pagelist,

	.write_pagelist			= bl_write_pagelist,

fs/nfs/pnfs.h

+3 −1
Original line number Diff line number Diff line
@@ -524,8 +524,10 @@ static inline int pnfs_return_layout(struct inode *ino) 
	struct nfs_inode *nfsi = NFS_I(ino);

	struct nfs_server *nfss = NFS_SERVER(ino);



	if (pnfs_enabled_sb(nfss) && nfsi->layout)

	if (pnfs_enabled_sb(nfss) && nfsi->layout) {

		set_bit(NFS_LAYOUT_RETURN_REQUESTED, &nfsi->layout->plh_flags);

		return _pnfs_return_layout(ino);

	}



	return 0;

}