diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2010-09-06 12:31:37 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2010-10-14 18:38:35 +0200 |
| commit | a821cc4a9a8d9e67356f9a5cfc1206aa3cfd30f7 (patch) | |
| tree | d63daf31b85cefc993e6345fcd3ef3f6faac6474 /drivers/block/drbd | |
| parent | drbd: fix potential kernel BUG (NULL deref) (diff) | |
| download | linux-a821cc4a9a8d9e67356f9a5cfc1206aa3cfd30f7.tar.xz linux-a821cc4a9a8d9e67356f9a5cfc1206aa3cfd30f7.zip | |
drbd: fix spurious protocol error
If we cannot satisfy a request (because our disk just broke),
we still need to drain the payload. Or we'll get a protocol error
when interpreting the payload as DRBD packet header.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index e4e4eddf04f2..983e49cbd233 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -2085,7 +2085,8 @@ static int receive_DataRequest(struct drbd_conf *mdev, enum drbd_packets cmd, un "no local data.\n"); drbd_send_ack_rp(mdev, cmd == P_DATA_REQUEST ? P_NEG_DREPLY : P_NEG_RS_DREPLY , p); - return TRUE; + /* drain possibly payload */ + return drbd_drain_block(mdev, digest_size); } /* GFP_NOIO, because we must not cause arbitrary write-out: in a DRBD |