From: Lars Ellenberg Date: Mon, 28 Apr 2014 16:43:25 +0000 (+0200) Subject: drbd: Enable QUEUE_FLAG_DISCARD only if the peer can recieve P_TRIM X-Git-Tag: omap-for-v3.16/fixes-against-rc1~39^2~47^2~34 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20c68fdea1646ed746abf19122d7699493927005;p=pandora-kernel.git drbd: Enable QUEUE_FLAG_DISCARD only if the peer can recieve P_TRIM Allow the user of REQ_DISCARD. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg Signed-off-by: Jens Axboe --- diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 29123dfb5f84..d5f39fda6462 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -618,6 +618,7 @@ struct drbd_connection { struct drbd_socket data; /* data/barrier/cstate/parameter packets */ struct drbd_socket meta; /* ping/ack (metadata) packets */ int agreed_pro_version; /* actually used protocol version */ + u32 agreed_features; unsigned long last_received; /* in jiffies, either socket */ unsigned int ko_count; Reading git-diff-tree failed