1 files changed, 23 insertions, 7 deletions

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 38b0f91175d0..8333db12caca 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -802,13 +802,29 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
                 * SETCLIENTID_CONFIRM, PUTFH and PUTROOTFH
                 * require a valid current filehandle
                 */
-                if ((!current_fh->fh_dentry) &&
-                   !((op->opnum == OP_PUTFH) || (op->opnum == OP_PUTROOTFH) ||
-                   (op->opnum == OP_SETCLIENTID) ||
-                   (op->opnum == OP_SETCLIENTID_CONFIRM) ||
-                   (op->opnum == OP_RENEW) || (op->opnum == OP_RESTOREFH) ||
-                   (op->opnum == OP_RELEASE_LOCKOWNER))) {
-                        op->status = nfserr_nofilehandle;
+                if (!current_fh->fh_dentry) {
+                        if (!((op->opnum == OP_PUTFH) ||
+                              (op->opnum == OP_PUTROOTFH) ||
+                              (op->opnum == OP_SETCLIENTID) ||
+                              (op->opnum == OP_SETCLIENTID_CONFIRM) ||
+                              (op->opnum == OP_RENEW) ||
+                              (op->opnum == OP_RESTOREFH) ||
+                              (op->opnum == OP_RELEASE_LOCKOWNER))) {
+                                op->status = nfserr_nofilehandle;
+                                goto encode_op;
+                        }
+                }
+                /* Check must be done at start of each operation, except
+                 * for GETATTR and ops not listed as returning NFS4ERR_MOVED
+                 */
+                else if (current_fh->fh_export->ex_fslocs.migrated &&
+                         !((op->opnum == OP_GETATTR) ||
+                           (op->opnum == OP_PUTROOTFH) ||
+                           (op->opnum == OP_PUTPUBFH) ||
+                           (op->opnum == OP_RENEW) ||
+                           (op->opnum == OP_SETCLIENTID) ||
+                           (op->opnum == OP_RELEASE_LOCKOWNER))) {
+                        op->status = nfserr_moved;
                         goto encode_op;
                 }
                 switch (op->opnum) {