diff options
Diffstat (limited to 'drivers/block/rbd.c')
-rw-r--r-- | drivers/block/rbd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index c7bf9613ad40..ce26b749ede0 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c | |||
@@ -740,13 +740,13 @@ static char *rbd_segment_name(struct rbd_device *rbd_dev, u64 offset) | |||
740 | u64 segment; | 740 | u64 segment; |
741 | int ret; | 741 | int ret; |
742 | 742 | ||
743 | name = kmalloc(RBD_MAX_SEG_NAME_LEN + 1, GFP_NOIO); | 743 | name = kmalloc(MAX_OBJ_NAME_SIZE + 1, GFP_NOIO); |
744 | if (!name) | 744 | if (!name) |
745 | return NULL; | 745 | return NULL; |
746 | segment = offset >> rbd_dev->header.obj_order; | 746 | segment = offset >> rbd_dev->header.obj_order; |
747 | ret = snprintf(name, RBD_MAX_SEG_NAME_LEN, "%s.%012llx", | 747 | ret = snprintf(name, MAX_OBJ_NAME_SIZE + 1, "%s.%012llx", |
748 | rbd_dev->header.object_prefix, segment); | 748 | rbd_dev->header.object_prefix, segment); |
749 | if (ret < 0 || ret >= RBD_MAX_SEG_NAME_LEN) { | 749 | if (ret < 0 || ret > MAX_OBJ_NAME_SIZE) { |
750 | pr_err("error formatting segment name for #%llu (%d)\n", | 750 | pr_err("error formatting segment name for #%llu (%d)\n", |
751 | segment, ret); | 751 | segment, ret); |
752 | kfree(name); | 752 | kfree(name); |