diff options
| author | Andreas Gruenbacher | 2011-07-17 23:06:12 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:57:59 +0100 |
| commit | 7d4c782cbda4af0d7dc39cb8e7d50a927781aa1f (patch) | |
| tree | 6876345c8a624293cf269471f87b8621449e6e9b /drivers/block/drbd/drbd_main.c | |
| parent | drbd: Turn tl_apply() into tl_abort_disk_io() (diff) | |
| download | kernel-qcow2-linux-7d4c782cbda4af0d7dc39cb8e7d50a927781aa1f.tar.gz kernel-qcow2-linux-7d4c782cbda4af0d7dc39cb8e7d50a927781aa1f.tar.xz kernel-qcow2-linux-7d4c782cbda4af0d7dc39cb8e7d50a927781aa1f.zip | |
drbd: Fix the data-integrity-alg setting
The last data-integrity-alg fix made data integrity checking work when the
algorithm was changed for an established connection, but the common case of
configuring the algorithm before connecting was still broken. Fix that.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_main.c')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 137935037664..c941d3a2b30c 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -1775,8 +1775,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req) sock = &mdev->tconn->data; p = drbd_prepare_command(mdev, sock); - dgs = (mdev->tconn->agreed_pro_version >= 87 && mdev->tconn->integrity_tfm) ? - crypto_hash_digestsize(mdev->tconn->integrity_tfm) : 0; + dgs = mdev->tconn->integrity_tfm ? crypto_hash_digestsize(mdev->tconn->integrity_tfm) : 0; if (!p) return -EIO; @@ -1849,8 +1848,7 @@ int drbd_send_block(struct drbd_conf *mdev, enum drbd_packet cmd, sock = &mdev->tconn->data; p = drbd_prepare_command(mdev, sock); - dgs = (mdev->tconn->agreed_pro_version >= 87 && mdev->tconn->integrity_tfm) ? - crypto_hash_digestsize(mdev->tconn->integrity_tfm) : 0; + dgs = mdev->tconn->integrity_tfm ? crypto_hash_digestsize(mdev->tconn->integrity_tfm) : 0; if (!p) return -EIO; |