NFSv4: Cleanup setting of the migration flags.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index d9fc34dedcf8e64ee8e487cb4e83623ac0af39d1..15e91f003adc5871e74b62a6267ba03f71be9253 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -7498,13 +7498,10 @@ nfs4_run_exchange_id(struct nfs_client *clp, struct rpc_cred *cred,
                                sizeof(calldata->args.verifier.data));
        }
        calldata->args.client = clp;
-#ifdef CONFIG_NFS_V4_1_MIGRATION
-       calldata->args.flags = EXCHGID4_FLAG_SUPP_MOVED_REFER |
-       EXCHGID4_FLAG_BIND_PRINC_STATEID |
-       EXCHGID4_FLAG_SUPP_MOVED_MIGR,
-#else
        calldata->args.flags = EXCHGID4_FLAG_SUPP_MOVED_REFER |
-       EXCHGID4_FLAG_BIND_PRINC_STATEID,
+       EXCHGID4_FLAG_BIND_PRINC_STATEID;
+#ifdef CONFIG_NFS_V4_1_MIGRATION
+       calldata->args.flags |= EXCHGID4_FLAG_SUPP_MOVED_MIGR;
 #endif
        msg.rpc_argp = &calldata->args;
        msg.rpc_resp = &calldata->res;