4 files changed, 25 insertions, 12 deletions

diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index 87afb9ec4c68..9cab80207ced 100644
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -255,6 +255,7 @@ enum {
         Opt_nocephx_sign_messages,
         Opt_tcp_nodelay,
         Opt_notcp_nodelay,
+        Opt_abort_on_full,
 };
 
 static match_table_t opt_tokens = {
@@ -280,6 +281,7 @@ static match_table_t opt_tokens = {
         {Opt_nocephx_sign_messages, "nocephx_sign_messages"},
         {Opt_tcp_nodelay, "tcp_nodelay"},
         {Opt_notcp_nodelay, "notcp_nodelay"},
+        {Opt_abort_on_full, "abort_on_full"},
         {-1, NULL}
 };
 
@@ -535,6 +537,10 @@ ceph_parse_options(char *options, const char *dev_name,
                         opt->flags &= ~CEPH_OPT_TCP_NODELAY;
                         break;
 
+                case Opt_abort_on_full:
+                        opt->flags |= CEPH_OPT_ABORT_ON_FULL;
+                        break;
+
                 default:
                         BUG_ON(token);
                 }
@@ -549,7 +555,8 @@ out:
 }
 EXPORT_SYMBOL(ceph_parse_options);
 
-int ceph_print_client_options(struct seq_file *m, struct ceph_client *client)
+int ceph_print_client_options(struct seq_file *m, struct ceph_client *client,
+                              bool show_all)
 {
         struct ceph_options *opt = client->options;
         size_t pos = m->count;
@@ -574,6 +581,8 @@ int ceph_print_client_options(struct seq_file *m, struct ceph_client *client)
                 seq_puts(m, "nocephx_sign_messages,");
         if ((opt->flags & CEPH_OPT_TCP_NODELAY) == 0)
                 seq_puts(m, "notcp_nodelay,");
+        if (show_all && (opt->flags & CEPH_OPT_ABORT_ON_FULL))
+                seq_puts(m, "abort_on_full,");
 
         if (opt->mount_timeout != CEPH_MOUNT_TIMEOUT_DEFAULT)
                 seq_printf(m, "mount_timeout=%d,",
diff --git a/net/ceph/debugfs.c b/net/ceph/debugfs.c
index 02952605d121..46f65709a6ff 100644
--- a/net/ceph/debugfs.c
+++ b/net/ceph/debugfs.c
@@ -375,7 +375,7 @@ static int client_options_show(struct seq_file *s, void *p)
         struct ceph_client *client = s->private;
         int ret;
 
-        ret = ceph_print_client_options(s, client);
+        ret = ceph_print_client_options(s, client, true);
         if (ret)
                 return ret;
 
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index d5718284db57..7e71b0df1fbc 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -2058,6 +2058,8 @@ static int process_connect(struct ceph_connection *con)
         dout("process_connect on %p tag %d\n", con, (int)con->in_tag);
 
         if (con->auth) {
+                int len = le32_to_cpu(con->in_reply.authorizer_len);
+
                 /*
                  * Any connection that defines ->get_authorizer()
                  * should also define ->add_authorizer_challenge() and
@@ -2067,8 +2069,7 @@ static int process_connect(struct ceph_connection *con)
                  */
                 if (con->in_reply.tag == CEPH_MSGR_TAG_CHALLENGE_AUTHORIZER) {
                         ret = con->ops->add_authorizer_challenge(
-                                    con, con->auth->authorizer_reply_buf,
-                                    le32_to_cpu(con->in_reply.authorizer_len));
+                                    con, con->auth->authorizer_reply_buf, len);
                         if (ret < 0)
                                 return ret;
 
@@ -2078,10 +2079,12 @@ static int process_connect(struct ceph_connection *con)
                         return 0;
                 }
 
-                ret = con->ops->verify_authorizer_reply(con);
-                if (ret < 0) {
-                        con->error_msg = "bad authorize reply";
-                        return ret;
+                if (len) {
+                        ret = con->ops->verify_authorizer_reply(con);
+                        if (ret < 0) {
+                                con->error_msg = "bad authorize reply";
+                                return ret;
+                        }
                 }
         }
 
@@ -3206,9 +3209,10 @@ void ceph_con_keepalive(struct ceph_connection *con)
         dout("con_keepalive %p\n", con);
         mutex_lock(&con->mutex);
         clear_standby(con);
+        con_flag_set(con, CON_FLAG_KEEPALIVE_PENDING);
         mutex_unlock(&con->mutex);
-        if (con_flag_test_and_set(con, CON_FLAG_KEEPALIVE_PENDING) == 0 &&
-            con_flag_test_and_set(con, CON_FLAG_WRITE_PENDING) == 0)
+
+        if (con_flag_test_and_set(con, CON_FLAG_WRITE_PENDING) == 0)
                 queue_con(con);
 }
 EXPORT_SYMBOL(ceph_con_keepalive);
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index d23a9f81f3d7..fa9530dd876e 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -2315,7 +2315,7 @@ again:
                    (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) ||
                     pool_full(osdc, req->r_t.base_oloc.pool))) {
                 dout("req %p full/pool_full\n", req);
-                if (osdc->abort_on_full) {
+                if (ceph_test_opt(osdc->client, ABORT_ON_FULL)) {
                         err = -ENOSPC;
                 } else {
                         pr_warn_ratelimited("FULL or reached pool quota\n");
@@ -2545,7 +2545,7 @@ static void ceph_osdc_abort_on_full(struct ceph_osd_client *osdc)
 {
         bool victims = false;
 
-        if (osdc->abort_on_full &&
+        if (ceph_test_opt(osdc->client, ABORT_ON_FULL) &&
             (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) || have_pool_full(osdc)))
                 for_each_request(osdc, abort_on_full_fn, &victims);
 }