diff mbox series

[2/5] NFSv4/pNFS: Do not fail I/O when we fail to allocate the pNFS layout

Message ID 20220514140814.3655-2-trondmy@kernel.org (mailing list archive)
State New
Headers show
Series [1/5] NFS: Memory allocation failures are not server fatal errors | expand

Commit Message

trondmy@kernel.org May 14, 2022, 2:08 p.m. UTC
From: Trond Myklebust <trond.myklebust@hammerspace.com>

Commit 587f03deb69b caused pnfs_update_layout() to stop returning ENOMEM
when the memory allocation fails, and hence causes it to fall back to
trying to do I/O through the MDS. There is no guarantee that this will
fare any better. If we're failing the pNFS layout allocation, then we
should just redirty the page and retry later.

Reported-by: Olga Kornievskaia <aglo@umich.edu>
Fixes: 587f03deb69b ("pnfs: refactor send_layoutget")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
 fs/nfs/pnfs.c | 2 ++
 1 file changed, 2 insertions(+)
diff mbox series


diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 856c962273c7..68a87be3e6f9 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -2000,6 +2000,7 @@  pnfs_update_layout(struct inode *ino,
 	lo = pnfs_find_alloc_layout(ino, ctx, gfp_flags);
 	if (lo == NULL) {
+		lseg = ERR_PTR(-ENOMEM);
 		trace_pnfs_update_layout(ino, pos, count, iomode, lo, lseg,
 		goto out;
@@ -2128,6 +2129,7 @@  pnfs_update_layout(struct inode *ino,
 	lgp = pnfs_alloc_init_layoutget_args(ino, ctx, &stateid, &arg, gfp_flags);
 	if (!lgp) {
+		lseg = ERR_PTR(-ENOMEM);
 		trace_pnfs_update_layout(ino, pos, count, iomode, lo, NULL,