1 files changed, 10 insertions, 9 deletions

diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 0e262f32ac41..c8e9f637153a 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -645,7 +645,6 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *c
                 .timeout        = &timeparms,
                 .program        = &cb_program,
                 .version        = 0,
-                .authflavor     = clp->cl_flavor,
                 .flags          = (RPC_CLNT_CREATE_NOPING | RPC_CLNT_CREATE_QUIET),
         };
         struct rpc_clnt *client;
@@ -656,6 +655,7 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *c
                 args.client_name = clp->cl_principal;
                 args.prognumber = conn->cb_prog,
                 args.protocol = XPRT_TRANSPORT_TCP;
+                args.authflavor = clp->cl_flavor;
                 clp->cl_cb_ident = conn->cb_ident;
         } else {
                 if (!conn->cb_xprt)
@@ -665,6 +665,7 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *c
                 args.bc_xprt = conn->cb_xprt;
                 args.prognumber = clp->cl_cb_session->se_cb_prog;
                 args.protocol = XPRT_TRANSPORT_BC_TCP;
+                args.authflavor = RPC_AUTH_UNIX;
         }
         /* Create RPC client */
         client = rpc_create(&args);
@@ -754,9 +755,9 @@ static void do_probe_callback(struct nfs4_client *clp)
  */
 void nfsd4_probe_callback(struct nfs4_client *clp)
 {
-        /* XXX: atomicity?  Also, should we be using cl_cb_flags? */
+        /* XXX: atomicity?  Also, should we be using cl_flags? */
         clp->cl_cb_state = NFSD4_CB_UNKNOWN;
-        set_bit(NFSD4_CLIENT_CB_UPDATE, &clp->cl_cb_flags);
+        set_bit(NFSD4_CLIENT_CB_UPDATE, &clp->cl_flags);
         do_probe_callback(clp);
 }
 
@@ -915,7 +916,7 @@ void nfsd4_destroy_callback_queue(void)
 /* must be called under the state lock */
 void nfsd4_shutdown_callback(struct nfs4_client *clp)
 {
-        set_bit(NFSD4_CLIENT_KILL, &clp->cl_cb_flags);
+        set_bit(NFSD4_CLIENT_CB_KILL, &clp->cl_flags);
         /*
          * Note this won't actually result in a null callback;
          * instead, nfsd4_do_callback_rpc() will detect the killed
@@ -966,15 +967,15 @@ static void nfsd4_process_cb_update(struct nfsd4_callback *cb)
                 svc_xprt_put(clp->cl_cb_conn.cb_xprt);
                 clp->cl_cb_conn.cb_xprt = NULL;
         }
-        if (test_bit(NFSD4_CLIENT_KILL, &clp->cl_cb_flags))
+        if (test_bit(NFSD4_CLIENT_CB_KILL, &clp->cl_flags))
                 return;
         spin_lock(&clp->cl_lock);
         /*
          * Only serialized callback code is allowed to clear these
          * flags; main nfsd code can only set them:
          */
-        BUG_ON(!clp->cl_cb_flags);
-        clear_bit(NFSD4_CLIENT_CB_UPDATE, &clp->cl_cb_flags);
+        BUG_ON(!(clp->cl_flags & NFSD4_CLIENT_CB_FLAG_MASK));
+        clear_bit(NFSD4_CLIENT_CB_UPDATE, &clp->cl_flags);
         memcpy(&conn, &cb->cb_clp->cl_cb_conn, sizeof(struct nfs4_cb_conn));
         c = __nfsd4_find_backchannel(clp);
         if (c) {
@@ -986,7 +987,7 @@ static void nfsd4_process_cb_update(struct nfsd4_callback *cb)
 
         err = setup_callback_client(clp, &conn, ses);
         if (err) {
-                warn_no_callback_path(clp, err);
+                nfsd4_mark_cb_down(clp, err);
                 return;
         }
         /* Yay, the callback channel's back! Restart any callbacks: */
@@ -1000,7 +1001,7 @@ void nfsd4_do_callback_rpc(struct work_struct *w)
         struct nfs4_client *clp = cb->cb_clp;
         struct rpc_clnt *clnt;
 
-        if (clp->cl_cb_flags)
+        if (clp->cl_flags & NFSD4_CLIENT_CB_FLAG_MASK)
                 nfsd4_process_cb_update(cb);
 
         clnt = clp->cl_cb_client;