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 <[email protected]> Signed-off-by: Anna Schumaker <[email protected]>
josf · Aug 16, 2018 · ea51f94 · ea51f94
1 parent ecf8402
commit ea51f94
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
@@ -1982,15 +1982,6 @@ pnfs_update_layout(struct inode *ino,
 				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: