Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 345991
b: refs/heads/master
c: 2735a59
h: refs/heads/master
i:
  345989: bc94c59
  345987: 7fdefaa
  345983: 0fa6f10
v: v3
  • Loading branch information
Andreas Gruenbacher authored and Philipp Reisner committed Nov 8, 2012
1 parent 8667626 commit 27b0e8b
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 37 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 859976758dc6f33ed76c21365bb49a4af9e2dd59
refs/heads/master: 2735a59467ad84b14bb43185702c0bab352126c0
69 changes: 33 additions & 36 deletions trunk/drivers/block/drbd/drbd_receiver.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4506,7 +4506,7 @@ static int got_conn_RqSReply(struct drbd_tconn *tconn, struct packet_info *pi)
}
wake_up(&tconn->ping_wait);

return true;
return 0;
}

static int got_RqSReply(struct drbd_tconn *tconn, struct packet_info *pi)
Expand All @@ -4517,7 +4517,7 @@ static int got_RqSReply(struct drbd_tconn *tconn, struct packet_info *pi)

mdev = vnr_to_mdev(tconn, pi->vnr);
if (!mdev)
return false;
return -EIO;

if (retcode >= SS_SUCCESS) {
set_bit(CL_ST_CHG_SUCCESS, &mdev->flags);
Expand All @@ -4528,12 +4528,12 @@ static int got_RqSReply(struct drbd_tconn *tconn, struct packet_info *pi)
}
wake_up(&mdev->state_wait);

return true;
return 0;
}

static int got_Ping(struct drbd_tconn *tconn, struct packet_info *pi)
{
return !drbd_send_ping_ack(tconn);
return drbd_send_ping_ack(tconn);

}

Expand All @@ -4544,7 +4544,7 @@ static int got_PingAck(struct drbd_tconn *tconn, struct packet_info *pi)
if (!test_and_set_bit(GOT_PING_ACK, &tconn->flags))
wake_up(&tconn->ping_wait);

return true;
return 0;
}

static int got_IsInSync(struct drbd_tconn *tconn, struct packet_info *pi)
Expand All @@ -4556,7 +4556,7 @@ static int got_IsInSync(struct drbd_tconn *tconn, struct packet_info *pi)

mdev = vnr_to_mdev(tconn, pi->vnr);
if (!mdev)
return false;
return -EIO;

D_ASSERT(mdev->tconn->agreed_pro_version >= 89);

Expand All @@ -4572,7 +4572,7 @@ static int got_IsInSync(struct drbd_tconn *tconn, struct packet_info *pi)
dec_rs_pending(mdev);
atomic_add(blksize >> 9, &mdev->rs_sect_in);

return true;
return 0;
}

static int
Expand Down Expand Up @@ -4607,14 +4607,14 @@ static int got_BlockAck(struct drbd_tconn *tconn, struct packet_info *pi)

mdev = vnr_to_mdev(tconn, pi->vnr);
if (!mdev)
return false;
return -EIO;

update_peer_seq(mdev, be32_to_cpu(p->seq_num));

if (p->block_id == ID_SYNCER) {
drbd_set_in_sync(mdev, sector, blksize);
dec_rs_pending(mdev);
return true;
return 0;
}
switch (pi->cmd) {
case P_RS_WRITE_ACK:
Expand All @@ -4638,13 +4638,12 @@ static int got_BlockAck(struct drbd_tconn *tconn, struct packet_info *pi)
what = POSTPONE_WRITE;
break;
default:
D_ASSERT(0);
return false;
BUG();
}

return !validate_req_change_req_state(mdev, p->block_id, sector,
&mdev->write_requests, __func__,
what, false);
return validate_req_change_req_state(mdev, p->block_id, sector,
&mdev->write_requests, __func__,
what, false);
}

static int got_NegAck(struct drbd_tconn *tconn, struct packet_info *pi)
Expand All @@ -4659,14 +4658,14 @@ static int got_NegAck(struct drbd_tconn *tconn, struct packet_info *pi)

mdev = vnr_to_mdev(tconn, pi->vnr);
if (!mdev)
return false;
return -EIO;

update_peer_seq(mdev, be32_to_cpu(p->seq_num));

if (p->block_id == ID_SYNCER) {
dec_rs_pending(mdev);
drbd_rs_failed_io(mdev, sector, size);
return true;
return 0;
}

err = validate_req_change_req_state(mdev, p->block_id, sector,
Expand All @@ -4679,10 +4678,10 @@ static int got_NegAck(struct drbd_tconn *tconn, struct packet_info *pi)
/* In Protocol B we might already have got a P_RECV_ACK
but then get a P_NEG_ACK afterwards. */
if (!missing_ok)
return false;
return err;
drbd_set_out_of_sync(mdev, sector, size);
}
return true;
return 0;
}

static int got_NegDReply(struct drbd_tconn *tconn, struct packet_info *pi)
Expand All @@ -4693,16 +4692,16 @@ static int got_NegDReply(struct drbd_tconn *tconn, struct packet_info *pi)

mdev = vnr_to_mdev(tconn, pi->vnr);
if (!mdev)
return false;
return -EIO;

update_peer_seq(mdev, be32_to_cpu(p->seq_num));

dev_err(DEV, "Got NegDReply; Sector %llus, len %u; Fail original request.\n",
(unsigned long long)sector, be32_to_cpu(p->blksize));

return !validate_req_change_req_state(mdev, p->block_id, sector,
&mdev->read_requests, __func__,
NEG_ACKED, false);
return validate_req_change_req_state(mdev, p->block_id, sector,
&mdev->read_requests, __func__,
NEG_ACKED, false);
}

static int got_NegRSDReply(struct drbd_tconn *tconn, struct packet_info *pi)
Expand All @@ -4714,7 +4713,7 @@ static int got_NegRSDReply(struct drbd_tconn *tconn, struct packet_info *pi)

mdev = vnr_to_mdev(tconn, pi->vnr);
if (!mdev)
return false;
return -EIO;

sector = be64_to_cpu(p->sector);
size = be32_to_cpu(p->blksize);
Expand All @@ -4731,14 +4730,12 @@ static int got_NegRSDReply(struct drbd_tconn *tconn, struct packet_info *pi)
case P_RS_CANCEL:
break;
default:
D_ASSERT(0);
put_ldev(mdev);
return false;
BUG();
}
put_ldev(mdev);
}

return true;
return 0;
}

static int got_BarrierAck(struct drbd_tconn *tconn, struct packet_info *pi)
Expand All @@ -4748,7 +4745,7 @@ static int got_BarrierAck(struct drbd_tconn *tconn, struct packet_info *pi)

mdev = vnr_to_mdev(tconn, pi->vnr);
if (!mdev)
return false;
return -EIO;

tl_release(mdev->tconn, p->barrier, be32_to_cpu(p->set_size));

Expand All @@ -4759,7 +4756,7 @@ static int got_BarrierAck(struct drbd_tconn *tconn, struct packet_info *pi)
add_timer(&mdev->start_resync_timer);
}

return true;
return 0;
}

static int got_OVResult(struct drbd_tconn *tconn, struct packet_info *pi)
Expand All @@ -4772,7 +4769,7 @@ static int got_OVResult(struct drbd_tconn *tconn, struct packet_info *pi)

mdev = vnr_to_mdev(tconn, pi->vnr);
if (!mdev)
return false;
return -EIO;

sector = be64_to_cpu(p->sector);
size = be32_to_cpu(p->blksize);
Expand All @@ -4785,7 +4782,7 @@ static int got_OVResult(struct drbd_tconn *tconn, struct packet_info *pi)
ov_out_of_sync_print(mdev);

if (!get_ldev(mdev))
return true;
return 0;

drbd_rs_complete_io(mdev, sector);
dec_rs_pending(mdev);
Expand All @@ -4809,12 +4806,12 @@ static int got_OVResult(struct drbd_tconn *tconn, struct packet_info *pi)
}
}
put_ldev(mdev);
return true;
return 0;
}

static int got_skip(struct drbd_tconn *tconn, struct packet_info *pi)
{
return true;
return 0;
}

static int tconn_process_done_ee(struct drbd_tconn *tconn)
Expand Down Expand Up @@ -4968,10 +4965,10 @@ int drbd_asender(struct drbd_thread *thi)
}
}
if (received == expect) {
bool rv;
bool err;

rv = cmd->fn(tconn, &pi);
if (!rv) {
err = cmd->fn(tconn, &pi);
if (err) {
conn_err(tconn, "%pf failed\n", cmd->fn);
goto reconnect;
}
Expand Down

0 comments on commit 27b0e8b

Please sign in to comment.