diff options
Diffstat (limited to 'drivers/block/drbd/drbd_worker.c')
-rw-r--r-- | drivers/block/drbd/drbd_worker.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index 53be1eaa95de..db63b1ff4b35 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c | |||
@@ -881,7 +881,7 @@ int drbd_resync_finished(struct drbd_device *device) | |||
881 | khelper_cmd = "out-of-sync"; | 881 | khelper_cmd = "out-of-sync"; |
882 | } | 882 | } |
883 | } else { | 883 | } else { |
884 | D_ASSERT((n_oos - device->rs_failed) == 0); | 884 | D_ASSERT(device, (n_oos - device->rs_failed) == 0); |
885 | 885 | ||
886 | if (os.conn == C_SYNC_TARGET || os.conn == C_PAUSED_SYNC_T) | 886 | if (os.conn == C_SYNC_TARGET || os.conn == C_PAUSED_SYNC_T) |
887 | khelper_cmd = "after-resync-target"; | 887 | khelper_cmd = "after-resync-target"; |
@@ -1099,7 +1099,7 @@ int w_e_end_csum_rs_req(struct drbd_work *w, int cancel) | |||
1099 | * introducing more locking mechanisms */ | 1099 | * introducing more locking mechanisms */ |
1100 | if (first_peer_device(device)->connection->csums_tfm) { | 1100 | if (first_peer_device(device)->connection->csums_tfm) { |
1101 | digest_size = crypto_hash_digestsize(first_peer_device(device)->connection->csums_tfm); | 1101 | digest_size = crypto_hash_digestsize(first_peer_device(device)->connection->csums_tfm); |
1102 | D_ASSERT(digest_size == di->digest_size); | 1102 | D_ASSERT(device, digest_size == di->digest_size); |
1103 | digest = kmalloc(digest_size, GFP_NOIO); | 1103 | digest = kmalloc(digest_size, GFP_NOIO); |
1104 | } | 1104 | } |
1105 | if (digest) { | 1105 | if (digest) { |
@@ -1223,7 +1223,7 @@ int w_e_end_ov_reply(struct drbd_work *w, int cancel) | |||
1223 | if (digest) { | 1223 | if (digest) { |
1224 | drbd_csum_ee(device, first_peer_device(device)->connection->verify_tfm, peer_req, digest); | 1224 | drbd_csum_ee(device, first_peer_device(device)->connection->verify_tfm, peer_req, digest); |
1225 | 1225 | ||
1226 | D_ASSERT(digest_size == di->digest_size); | 1226 | D_ASSERT(device, digest_size == di->digest_size); |
1227 | eq = !memcmp(digest, di->digest, digest_size); | 1227 | eq = !memcmp(digest, di->digest, digest_size); |
1228 | kfree(digest); | 1228 | kfree(digest); |
1229 | } | 1229 | } |
@@ -1936,7 +1936,7 @@ int drbd_worker(struct drbd_thread *thi) | |||
1936 | rcu_read_lock(); | 1936 | rcu_read_lock(); |
1937 | idr_for_each_entry(&connection->peer_devices, peer_device, vnr) { | 1937 | idr_for_each_entry(&connection->peer_devices, peer_device, vnr) { |
1938 | struct drbd_device *device = peer_device->device; | 1938 | struct drbd_device *device = peer_device->device; |
1939 | D_ASSERT(device->state.disk == D_DISKLESS && device->state.conn == C_STANDALONE); | 1939 | D_ASSERT(device, device->state.disk == D_DISKLESS && device->state.conn == C_STANDALONE); |
1940 | kref_get(&device->kref); | 1940 | kref_get(&device->kref); |
1941 | rcu_read_unlock(); | 1941 | rcu_read_unlock(); |
1942 | drbd_device_cleanup(device); | 1942 | drbd_device_cleanup(device); |