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 <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index cf9912a95f5df792bc097e1fcc670120cf55ef7b..e11e666ea4774a27c0c47bd7d8adeea091eacd70 100644 (file)
--- 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: