asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drbd: Ignore packets for non existing volumes

Browse source 
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Philipp Reisner 2011-03-15 14:38:01 +01:00
parent 85f75dd763
commit 2de876efa6
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
drivers/block/drbd/drbd_receiver.c
View file

@ -3794,27 +3794,40 @@ static int receive_bitmap(struct drbd_conf *mdev, enum drbd_packet cmd,
return ok;
}
static int receive_skip(struct drbd_conf *mdev, enum drbd_packet cmd,
unsigned int data_size)
static int _tconn_receive_skip(struct drbd_tconn *tconn, unsigned int data_size)
{
/* TODO zero copy sink :) */
static char sink[128];
int size, want, r;
dev_warn(DEV, "skipping unknown optional packet type %d, l: %d!\n",
cmd, data_size);
size = data_size;
while (size > 0) {
want = min_t(int, size, sizeof(sink));
r = drbd_recv(mdev->tconn, sink, want);
if (!expect(r > 0))
r = drbd_recv(tconn, sink, want);
if (r <= 0)
break;
size -= r;
}
return size == 0;
}
static int receive_skip(struct drbd_conf *mdev, enum drbd_packet cmd,
unsigned int data_size)
{
dev_warn(DEV, "skipping unknown optional packet type %d, l: %d!\n",
cmd, data_size);
return _tconn_receive_skip(mdev->tconn, data_size);
}
static int tconn_receive_skip(struct drbd_tconn *tconn, enum drbd_packet cmd, unsigned int data_size)
{
conn_warn(tconn, "skipping packet for non existing volume type %d, l: %d!\n",
cmd, data_size);
return _tconn_receive_skip(tconn, data_size);
}
static int receive_UnplugRemote(struct drbd_conf *mdev, enum drbd_packet cmd,
unsigned int data_size)
{
@ -3890,6 +3903,7 @@ static struct data_cmd drbd_cmd_handler[] = {
static void drbdd(struct drbd_tconn *tconn)
{
struct p_header *header = &tconn->data.rbuf.header;
struct drbd_conf *mdev;
struct packet_info pi;
size_t shs; /* sub header size */
int rv;
@ -3920,7 +3934,10 @@ static void drbdd(struct drbd_tconn *tconn)
}
}
rv = drbd_cmd_handler[pi.cmd].function(vnr_to_mdev(tconn, pi.vnr), pi.cmd, pi.size - shs);
mdev = vnr_to_mdev(tconn, pi.vnr);
rv = mdev ?
drbd_cmd_handler[pi.cmd].function(mdev, pi.cmd, pi.size - shs) :
tconn_receive_skip(tconn, pi.cmd, pi.size - shs);
if (unlikely(!rv)) {
conn_err(tconn, "error receiving %s, l: %d!\n",