diff options
| author | Philipp Reisner | 2011-05-03 13:27:43 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:55:41 +0100 |
| commit | ef5e44a672e444b6957fdccda3f40a5cbe202335 (patch) | |
| tree | 7405f97a262d5a643b77c776bd225cbe7ceb5b24 /drivers/block/drbd/drbd_receiver.c | |
| parent | drbd: Renamed the net_conf_update mutex to conf_update (diff) | |
| download | kernel-qcow2-linux-ef5e44a672e444b6957fdccda3f40a5cbe202335.tar.gz kernel-qcow2-linux-ef5e44a672e444b6957fdccda3f40a5cbe202335.tar.xz kernel-qcow2-linux-ef5e44a672e444b6957fdccda3f40a5cbe202335.zip | |
drbd: drbd_dew_dev_size() gets the user requests disk_size as argument
Preparing RCU for disk_conf
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_receiver.c')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 567d64b9906c..23614e40254a 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -3379,7 +3379,7 @@ static int receive_sizes(struct drbd_tconn *tconn, struct packet_info *pi) /* Never shrink a device with usable data during connect. But allow online shrinking if we are connected. */ - if (drbd_new_dev_size(mdev, mdev->ldev, 0) < + if (drbd_new_dev_size(mdev, mdev->ldev, p_usize, 0) < drbd_get_capacity(mdev->this_bdev) && mdev->state.disk >= D_OUTDATED && mdev->state.conn < C_CONNECTED) { |