Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / ceph / mon_client.c

diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
index aef5b1062beec7c0d9e45fbe4c77b6ec05b10d5a..1fe25cd29d0eceb66bb4924ee85e5a62b598c48a 100644 (file)
--- a/net/ceph/mon_client.c
+++ b/net/ceph/mon_client.c
@@ -737,7 +737,7 @@ static void delayed_work(struct work_struct *work)
 
                __validate_auth(monc);
 
-               if (monc->auth->ops->is_authenticated(monc->auth))
+               if (ceph_auth_is_authenticated(monc->auth))
                        __send_subscribe(monc);
        }
        __schedule_delayed(monc);
@@ -892,8 +892,7 @@ static void handle_auth_reply(struct ceph_mon_client *monc,
 
        mutex_lock(&monc->mutex);
        had_debugfs_info = have_debugfs_info(monc);
-       if (monc->auth->ops)
-               was_auth = monc->auth->ops->is_authenticated(monc->auth);
+       was_auth = ceph_auth_is_authenticated(monc->auth);
        monc->pending_auth = 0;
        ret = ceph_handle_auth_reply(monc->auth, msg->front.iov_base,
                                     msg->front.iov_len,
@@ -904,7 +903,7 @@ static void handle_auth_reply(struct ceph_mon_client *monc,
                wake_up_all(&monc->client->auth_wq);
        } else if (ret > 0) {
                __send_prepared_auth_request(monc, ret);
-       } else if (!was_auth && monc->auth->ops->is_authenticated(monc->auth)) {
+       } else if (!was_auth && ceph_auth_is_authenticated(monc->auth)) {
                dout("authenticated, starting session\n");
 
                monc->client->msgr.inst.name.type = CEPH_ENTITY_TYPE_CLIENT;