From ea51f94b45a0fd657c61206c1b648cc72f95befa Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Wed, 15 Aug 2018 21:35:45 -0400 Subject: [PATCH] pNFS: Treat RECALLCONFLICT like DELAY... Yes, it is possible to get trapped in a loop, but the server should be administratively revoking the recalled layout if it never gets returned. Signed-off-by: Trond Myklebust Signed-off-by: Anna Schumaker --- fs/nfs/pnfs.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index cf9912a95f5d..e11e666ea477 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1982,15 +1982,6 @@ lookup_again: lseg = NULL; break; case -ERECALLCONFLICT: - /* Huh? We hold no layouts, how is there a recall? */ - if (first) { - lseg = NULL; - break; - } - /* Destroy the existing layout and start over */ - if (time_after(jiffies, giveup)) - pnfs_destroy_layout(NFS_I(ino)); - /* Fallthrough */ case -EAGAIN: break; default: -- 2.39.5