drbd: Silenced compiler warnings
Since version 4.6.1 gcc warns about variables that get
a value assigned, but which are never read later on.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index aba04d7..e823968 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -4324,7 +4324,7 @@
{
struct drbd_conf *mdev;
enum drbd_conns oc;
- int vnr, rv = SS_UNKNOWN_ERROR;
+ int vnr;
if (tconn->cstate == C_STANDALONE)
return;
@@ -4351,7 +4351,7 @@
spin_lock_irq(&tconn->req_lock);
oc = tconn->cstate;
if (oc >= C_UNCONNECTED)
- rv = _conn_request_state(tconn, NS(conn, C_UNCONNECTED), CS_VERBOSE);
+ _conn_request_state(tconn, NS(conn, C_UNCONNECTED), CS_VERBOSE);
spin_unlock_irq(&tconn->req_lock);
@@ -4361,7 +4361,6 @@
static int drbd_disconnected(struct drbd_conf *mdev)
{
- enum drbd_fencing_p fp;
unsigned int i;
/* wait for current activity to cease. */
@@ -4405,14 +4404,6 @@
drbd_md_sync(mdev);
- fp = FP_DONT_CARE;
- if (get_ldev(mdev)) {
- rcu_read_lock();
- fp = rcu_dereference(mdev->ldev->disk_conf)->fencing;
- rcu_read_unlock();
- put_ldev(mdev);
- }
-
/* serialize with bitmap writeout triggered by the state change,
* if any. */
wait_event(mdev->misc_wait, !test_bit(BITMAP_IO, &mdev->flags));