Staging: lustre: llite: Use () around long macro

[linux-2.6-block.git] / net / ceph / messenger.c

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index b2f571dd933dde47dd8887c392b0f13c7bfef101..559c9f619c2027e33f733469b2a8a59eda582f89 100644 (file)
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -292,7 +292,11 @@ int ceph_msgr_init(void)
        if (ceph_msgr_slab_init())
                return -ENOMEM;
 
-       ceph_msgr_wq = alloc_workqueue("ceph-msgr", 0, 0);
+       /*
+        * The number of active work items is limited by the number of
+        * connections, so leave @max_active at default.
+        */
+       ceph_msgr_wq = alloc_workqueue("ceph-msgr", WQ_MEM_RECLAIM, 0);
        if (ceph_msgr_wq)
                return 0;
 
@@ -1937,11 +1941,11 @@ static int process_banner(struct ceph_connection *con)
                   sizeof(con->peer_addr)) != 0 &&
            !(addr_is_blank(&con->actual_peer_addr.in_addr) &&
              con->actual_peer_addr.nonce == con->peer_addr.nonce)) {
-               pr_warning("wrong peer, want %s/%d, got %s/%d\n",
-                          ceph_pr_addr(&con->peer_addr.in_addr),
-                          (int)le32_to_cpu(con->peer_addr.nonce),
-                          ceph_pr_addr(&con->actual_peer_addr.in_addr),
-                          (int)le32_to_cpu(con->actual_peer_addr.nonce));
+               pr_warn("wrong peer, want %s/%d, got %s/%d\n",
+                       ceph_pr_addr(&con->peer_addr.in_addr),
+                       (int)le32_to_cpu(con->peer_addr.nonce),
+                       ceph_pr_addr(&con->actual_peer_addr.in_addr),
+                       (int)le32_to_cpu(con->actual_peer_addr.nonce));
                con->error_msg = "wrong peer at address";
                return -1;
        }
@@ -2302,7 +2306,7 @@ static int read_partial_message(struct ceph_connection *con)
 
                BUG_ON(!con->in_msg ^ skip);
                if (con->in_msg && data_len > con->in_msg->data_length) {
-                       pr_warning("%s skipping long message (%u > %zd)\n",
+                       pr_warn("%s skipping long message (%u > %zd)\n",
                                __func__, data_len, con->in_msg->data_length);
                        ceph_msg_put(con->in_msg);
                        con->in_msg = NULL;
@@ -2712,7 +2716,7 @@ static bool con_sock_closed(struct ceph_connection *con)
        CASE(OPEN);
        CASE(STANDBY);
        default:
-               pr_warning("%s con %p unrecognized state %lu\n",
+               pr_warn("%s con %p unrecognized state %lu\n",
                        __func__, con, con->state);
                con->error_msg = "unrecognized con state";
                BUG();
@@ -2828,8 +2832,8 @@ static void con_work(struct work_struct *work)
  */
 static void con_fault(struct ceph_connection *con)
 {
-       pr_warning("%s%lld %s %s\n", ENTITY_NAME(con->peer_name),
-              ceph_pr_addr(&con->peer_addr.in_addr), con->error_msg);
+       pr_warn("%s%lld %s %s\n", ENTITY_NAME(con->peer_name),
+               ceph_pr_addr(&con->peer_addr.in_addr), con->error_msg);
        dout("fault %p state %lu to peer %s\n",
             con, con->state, ceph_pr_addr(&con->peer_addr.in_addr));
 
@@ -3071,10 +3075,8 @@ static void ceph_msg_data_destroy(struct ceph_msg_data *data)
                return;
 
        WARN_ON(!list_empty(&data->links));
-       if (data->type == CEPH_MSG_DATA_PAGELIST) {
+       if (data->type == CEPH_MSG_DATA_PAGELIST)
                ceph_pagelist_release(data->pagelist);
-               kfree(data->pagelist);
-       }
        kmem_cache_free(ceph_msg_data_cache, data);
 }