con->v1 union access

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index d1b5705dc0c648f6515e142b5d756e868491fbbd..9f6d860411cbd114c26332e78fb7e46bfedb6add 100644 (file)
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -1524,7 +1524,7 @@ static void con_fault_finish(struct ceph_connection *con)
         * in case we faulted due to authentication, invalidate our
         * current tickets so that we can get new ones.
         */
-       if (con->v1.auth_retry) {
+       if (!ceph_msgr2(from_msgr(con->msgr)) && con->v1.auth_retry) {
                dout("auth_retry %d, invalidating\n", con->v1.auth_retry);
                if (con->ops->invalidate_authorizer)
                        con->ops->invalidate_authorizer(con);
@@ -1714,9 +1714,10 @@ static void clear_standby(struct ceph_connection *con)
 {
        /* come back from STANDBY? */
        if (con->state == CEPH_CON_S_STANDBY) {
-               dout("clear_standby %p and ++connect_seq\n", con);
+               dout("clear_standby %p\n", con);
                con->state = CEPH_CON_S_PREOPEN;
-               con->v1.connect_seq++;
+               if (!ceph_msgr2(from_msgr(con->msgr)))
+                       con->v1.connect_seq++;
                WARN_ON(ceph_con_flag_test(con, CEPH_CON_F_WRITE_PENDING));
                WARN_ON(ceph_con_flag_test(con, CEPH_CON_F_KEEPALIVE_PENDING));
        }