From 1848bd8237ff05ac467230076e862b836df2a17b Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Fri, 9 Nov 2012 15:05:54 -0600 Subject: [PATCH] --- yaml --- r: 347613 b: refs/heads/master c: 2fd82b9e92c2a718ae81fc987b4468ceeee6979b h: refs/heads/master i: 347611: 9efd01dae970d9b58a68f70985f3fedb8a61951e v: v3 --- [refs] | 2 +- trunk/drivers/block/rbd.c | 6 +++--- trunk/drivers/block/rbd_types.h | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f1b1f57679fe..41da95cb29a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 685a7555ca69030739ddb57a47f0ea8ea80196a4 +refs/heads/master: 2fd82b9e92c2a718ae81fc987b4468ceeee6979b diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c index c7bf9613ad40..ce26b749ede0 100644 --- a/trunk/drivers/block/rbd.c +++ b/trunk/drivers/block/rbd.c @@ -740,13 +740,13 @@ static char *rbd_segment_name(struct rbd_device *rbd_dev, u64 offset) u64 segment; int ret; - name = kmalloc(RBD_MAX_SEG_NAME_LEN + 1, GFP_NOIO); + name = kmalloc(MAX_OBJ_NAME_SIZE + 1, GFP_NOIO); if (!name) return NULL; segment = offset >> rbd_dev->header.obj_order; - ret = snprintf(name, RBD_MAX_SEG_NAME_LEN, "%s.%012llx", + ret = snprintf(name, MAX_OBJ_NAME_SIZE + 1, "%s.%012llx", rbd_dev->header.object_prefix, segment); - if (ret < 0 || ret >= RBD_MAX_SEG_NAME_LEN) { + if (ret < 0 || ret > MAX_OBJ_NAME_SIZE) { pr_err("error formatting segment name for #%llu (%d)\n", segment, ret); kfree(name); diff --git a/trunk/drivers/block/rbd_types.h b/trunk/drivers/block/rbd_types.h index cbe77fa105ba..49d77cbcf8bd 100644 --- a/trunk/drivers/block/rbd_types.h +++ b/trunk/drivers/block/rbd_types.h @@ -46,8 +46,6 @@ #define RBD_MIN_OBJ_ORDER 16 #define RBD_MAX_OBJ_ORDER 30 -#define RBD_MAX_SEG_NAME_LEN 128 - #define RBD_COMP_NONE 0 #define RBD_CRYPT_NONE 0