diff --git a/[refs] b/[refs] index cc44fc72c42a..a39f85e01f09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 162f3ec7f026784ff2e216f19147d67e2f8ccd56 +refs/heads/master: 708d740ed8242b84eefc63df144313a7308c7de5 diff --git a/trunk/drivers/block/drbd/drbd_int.h b/trunk/drivers/block/drbd/drbd_int.h index 45d9a4534c40..1bc86ddac38b 100644 --- a/trunk/drivers/block/drbd/drbd_int.h +++ b/trunk/drivers/block/drbd/drbd_int.h @@ -747,12 +747,8 @@ struct drbd_epoch_entry { struct hlist_node colision; sector_t sector; unsigned int size; - struct drbd_epoch *epoch; - - /* up to here, the struct layout is identical to drbd_request; - * we might be able to use that to our advantage... */ - unsigned int flags; + struct drbd_epoch *epoch; u64 block_id; };