From 3eb87e133d3f53a7bb63aba8421ab4a3438377ae Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Wed, 4 May 2011 10:06:52 +0200 Subject: [PATCH] --- yaml --- r: 346047 b: refs/heads/master c: d589a21e5d9099a6351862ae6a7f4ae5ec4103d4 h: refs/heads/master i: 346045: 0b29b68c6974149cc4a2fdef7a47731dc86ca4c9 346043: 322198ca2f0cf82f1956a12be2a74301b0c18958 346039: 3e1e7eaf0f274cbdfb0e96ceccca61ec15bc9473 346031: 24c8cc92fc53ae4d4aaae6c78476fb41537aa91c 346015: fa32937368f7bdf0ef793cc7b447b2f68818b6c3 345983: 0fa6f10a9a0cc8ca981b7491a4b87cc5fe6dde90 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_nl.c | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index f90c267534f3..d425253451b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9958c857c760eec76f4fdf288b6f33a1c3b41833 +refs/heads/master: d589a21e5d9099a6351862ae6a7f4ae5ec4103d4 diff --git a/trunk/drivers/block/drbd/drbd_nl.c b/trunk/drivers/block/drbd/drbd_nl.c index 7fda3d9445ca..812e91f1b6d4 100644 --- a/trunk/drivers/block/drbd/drbd_nl.c +++ b/trunk/drivers/block/drbd/drbd_nl.c @@ -937,9 +937,6 @@ static int drbd_check_al_size(struct drbd_conf *mdev, struct disk_conf *dc) unsigned int in_use; int i; - if (!expect(dc->al_extents >= DRBD_AL_EXTENTS_MIN)) - dc->al_extents = DRBD_AL_EXTENTS_MIN; - if (mdev->act_log && mdev->act_log->nr_elements == dc->al_extents) return 0; @@ -1102,6 +1099,17 @@ static bool should_set_defaults(struct genl_info *info) return 0 != (flags & DRBD_GENL_F_SET_DEFAULTS); } +static void enforce_disk_conf_limits(struct disk_conf *dc) +{ + if (dc->al_extents < DRBD_AL_EXTENTS_MIN) + dc->al_extents = DRBD_AL_EXTENTS_MIN; + if (dc->al_extents > DRBD_AL_EXTENTS_MAX) + dc->al_extents = DRBD_AL_EXTENTS_MAX; + + if (dc->c_plan_ahead > DRBD_C_PLAN_AHEAD_MAX) + dc->c_plan_ahead = DRBD_C_PLAN_AHEAD_MAX; +} + int drbd_adm_disk_opts(struct sk_buff *skb, struct genl_info *info) { enum drbd_ret_code retcode; @@ -1146,11 +1154,7 @@ int drbd_adm_disk_opts(struct sk_buff *skb, struct genl_info *info) if (!expect(new_disk_conf->resync_rate >= 1)) new_disk_conf->resync_rate = 1; - /* clip to allowed range */ - if (!expect(new_disk_conf->al_extents >= DRBD_AL_EXTENTS_MIN)) - new_disk_conf->al_extents = DRBD_AL_EXTENTS_MIN; - if (!expect(new_disk_conf->al_extents <= DRBD_AL_EXTENTS_MAX)) - new_disk_conf->al_extents = DRBD_AL_EXTENTS_MAX; + enforce_disk_conf_limits(new_disk_conf); fifo_size = (new_disk_conf->c_plan_ahead * 10 * SLEEP_TIME) / HZ; if (fifo_size != mdev->rs_plan_s->size) { @@ -1273,6 +1277,8 @@ int drbd_adm_attach(struct sk_buff *skb, struct genl_info *info) goto fail; } + enforce_disk_conf_limits(new_disk_conf); + new_plan = fifo_alloc((new_disk_conf->c_plan_ahead * 10 * SLEEP_TIME) / HZ); if (!new_plan) { retcode = ERR_NOMEM; @@ -1450,8 +1456,6 @@ int drbd_adm_attach(struct sk_buff *skb, struct genl_info *info) else clear_bit(MD_NO_FUA, &mdev->flags); - /* FIXME Missing stuff: clip al range */ - /* Point of no return reached. * Devices and memory are no longer released by error cleanup below. * now mdev takes over responsibility, and the state engine should