diff options
| author | Andreas Gruenbacher <agruen@linbit.com> | 2011-07-06 11:01:44 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2014-02-17 16:45:03 +0100 |
| commit | 1ec861ebd0889263841b822ee3f3eb49caf23656 (patch) | |
| tree | fd7b5305f5083702c28e4034ad8882be1bb0ed7f /drivers/block/drbd/drbd_state.c | |
| parent | 3b52beffc57d6f1498a29d4edcb1cc2ad81241ec (diff) | |
| download | talos-obmc-linux-1ec861ebd0889263841b822ee3f3eb49caf23656.tar.gz talos-obmc-linux-1ec861ebd0889263841b822ee3f3eb49caf23656.zip | |
drbd: Replace and remove the obsolete conn_() macros
With the polymorphic drbd_() macros, we no longer need the connection
specific variants.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_state.c')
| -rw-r--r-- | drivers/block/drbd/drbd_state.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index df917c2067ca..e66f725ff169 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -507,7 +507,7 @@ static void conn_pr_state_change(struct drbd_connection *connection, union drbd_ is_susp(ns)); if (pbp != pb) - conn_info(connection, "%s\n", pb); + drbd_info(connection, "%s\n", pb); } @@ -1846,7 +1846,7 @@ _conn_request_state(struct drbd_connection *connection, union drbd_state mask, u acscw->w.connection = connection; drbd_queue_work(&connection->sender_work, &acscw->w); } else { - conn_err(connection, "Could not kmalloc an acscw\n"); + drbd_err(connection, "Could not kmalloc an acscw\n"); } abort: @@ -1859,9 +1859,9 @@ _conn_request_state(struct drbd_connection *connection, union drbd_state mask, u spin_lock_irq(&connection->req_lock); } if (rv < SS_SUCCESS && flags & CS_VERBOSE) { - conn_err(connection, "State change failed: %s\n", drbd_set_st_err_str(rv)); - conn_err(connection, " mask = 0x%x val = 0x%x\n", mask.i, val.i); - conn_err(connection, " old_conn:%s wanted_conn:%s\n", drbd_conn_str(oc), drbd_conn_str(val.conn)); + drbd_err(connection, "State change failed: %s\n", drbd_set_st_err_str(rv)); + drbd_err(connection, " mask = 0x%x val = 0x%x\n", mask.i, val.i); + drbd_err(connection, " old_conn:%s wanted_conn:%s\n", drbd_conn_str(oc), drbd_conn_str(val.conn)); } return rv; } |
