diff options
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
-rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 8e7875e72609..6bb1a2f2a38d 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c | |||
@@ -1481,11 +1481,11 @@ find_request(struct drbd_conf *mdev, | |||
1481 | hlist_for_each_entry(req, n, slot, collision) { | 1481 | hlist_for_each_entry(req, n, slot, collision) { |
1482 | if ((unsigned long)req != (unsigned long)id) | 1482 | if ((unsigned long)req != (unsigned long)id) |
1483 | continue; | 1483 | continue; |
1484 | if (req->sector != sector) { | 1484 | if (req->i.sector != sector) { |
1485 | dev_err(DEV, "%s: found request %lu but it has " | 1485 | dev_err(DEV, "%s: found request %lu but it has " |
1486 | "wrong sector (%llus versus %llus)\n", | 1486 | "wrong sector (%llus versus %llus)\n", |
1487 | func, (unsigned long)req, | 1487 | func, (unsigned long)req, |
1488 | (unsigned long long)req->sector, | 1488 | (unsigned long long)req->i.sector, |
1489 | (unsigned long long)sector); | 1489 | (unsigned long long)sector); |
1490 | return NULL; | 1490 | return NULL; |
1491 | } | 1491 | } |
@@ -1783,7 +1783,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned | |||
1783 | 1783 | ||
1784 | hlist_add_head(&e->collision, ee_hash_slot(mdev, sector)); | 1784 | hlist_add_head(&e->collision, ee_hash_slot(mdev, sector)); |
1785 | 1785 | ||
1786 | #define OVERLAPS overlaps(i->sector, i->size, sector, size) | 1786 | #define OVERLAPS overlaps(i->i.sector, i->i.size, sector, size) |
1787 | slot = tl_hash_slot(mdev, sector); | 1787 | slot = tl_hash_slot(mdev, sector); |
1788 | first = 1; | 1788 | first = 1; |
1789 | for (;;) { | 1789 | for (;;) { |
@@ -1800,7 +1800,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned | |||
1800 | " new: %llus +%u; pending: %llus +%u\n", | 1800 | " new: %llus +%u; pending: %llus +%u\n", |
1801 | current->comm, current->pid, | 1801 | current->comm, current->pid, |
1802 | (unsigned long long)sector, size, | 1802 | (unsigned long long)sector, size, |
1803 | (unsigned long long)i->sector, i->size); | 1803 | (unsigned long long)i->i.sector, i->i.size); |
1804 | if (i->rq_state & RQ_NET_PENDING) | 1804 | if (i->rq_state & RQ_NET_PENDING) |
1805 | ++have_unacked; | 1805 | ++have_unacked; |
1806 | ++have_conflict; | 1806 | ++have_conflict; |