From 86e528c6677b4eff40df5c2424fdb588effdc73e Mon Sep 17 00:00:00 2001 From: Andy Grover Date: Mon, 17 Dec 2012 14:14:38 -0800 Subject: [PATCH] lvm2app: No special behavior for 0 for max_snap_size in lvm_lv_snapshot() It isn't possible to choose a sane default for snapshot size, so just play it straight and use the passed size instead of adding special behavior for 0. Also revert change to Python lib, size parameter must be supplied. Signed-off-by: Andy Grover --- liblvm/lvm_lv.c | 11 +---------- python/liblvm.c | 4 ++-- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/liblvm/lvm_lv.c b/liblvm/lvm_lv.c index a02e68d75..91948a605 100644 --- a/liblvm/lvm_lv.c +++ b/liblvm/lvm_lv.c @@ -326,16 +326,7 @@ lv_t lvm_lv_snapshot(const lv_t lv, const char *snap_name, uint64_t max_snap_siz if (!vg_check_write_mode(lv->vg)) return NULL; - /* Determine the correct size */ - if (0 == max_snap_size){ - size = lv->size; - } else { - size = max_snap_size >> SECTOR_SHIFT; - - if (size > lv->size) { - size = lv->size; - } - } + size = max_snap_size >> SECTOR_SHIFT; if (!(extents = extents_from_size(lv->vg->cmd, size, lv->vg->extent_size))) { diff --git a/python/liblvm.c b/python/liblvm.c index 4db507c27..906825e34 100644 --- a/python/liblvm.c +++ b/python/liblvm.c @@ -1317,12 +1317,12 @@ static PyObject * liblvm_lvm_lv_snapshot(lvobject *self, PyObject *args) { const char *vgname; - uint64_t size = 0; + uint64_t size; lvobject *lvobj; LV_VALID(self); - if (!PyArg_ParseTuple(args, "s|l", &vgname, &size)) { + if (!PyArg_ParseTuple(args, "sl", &vgname, &size)) { return NULL; }