From: norbert.bizet <norbert.bizet@baculasystems.com>
Date: Fri, 16 Dec 2022 15:57:15 +0000 (-0500)
Subject: Cloud: change MaximumVolumeParts type to 32bits
X-Git-Tag: Beta-15.0.0~314
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f6399369299cc7da3f9e5c11e060cee542dda56;p=thirdparty%2Fbacula.git

Cloud: change MaximumVolumeParts type to 32bits
---

diff --git a/bacula/src/stored/dev.h b/bacula/src/stored/dev.h
index 12a6b6166..d7fcea0a3 100644
--- a/bacula/src/stored/dev.h
+++ b/bacula/src/stored/dev.h
@@ -334,7 +334,7 @@ public:
    uint64_t adata_addr;               /* Next adata write address */
 
    uint64_t max_part_size;            /* max part size */
-   uint64_t max_vol_parts_num;        /* Max number of parts in a cloud volume */
+   uint32_t max_vol_parts_num;        /* Max number of parts in a cloud volume */
    uint64_t part_size;                /* current part size */
    uint32_t part;                     /* current part number (starts at 0) */
    /* state ST_FREESPACE_OK is set if free_space is valid */
diff --git a/bacula/src/stored/record.h b/bacula/src/stored/record.h
index 59f7b6957..5558c1d18 100644
--- a/bacula/src/stored/record.h
+++ b/bacula/src/stored/record.h
@@ -207,7 +207,7 @@ struct Volume_Label {
 
   /* For Cloud */
   uint64_t  MaxPartSize;              /* Maximum Part Size */
-  uint64_t  MaxVolPartsNum;           /* Maximum Num of parts in a volume */
+  uint32_t  MaxVolPartsNum;           /* Maximum Num of parts in a volume */
 
   /* For Volume encryption */
   bool is_vol_encrypted;
diff --git a/bacula/src/stored/stored_conf.c b/bacula/src/stored/stored_conf.c
index b0cde618d..32c3d06e9 100644
--- a/bacula/src/stored/stored_conf.c
+++ b/bacula/src/stored/stored_conf.c
@@ -191,7 +191,7 @@ static RES_ITEM dev_items[] = {
    {"MaximumJobSpoolSize",   store_size64, ITEM(res_dev.max_job_spool_size), 0, 0, 0},
    {"DriveIndex",            store_pint32, ITEM(res_dev.drive_index), 0, 0, 0},
    {"MaximumPartSize",       store_size64, ITEM(res_dev.max_part_size), 0, ITEM_DEFAULT, 0},
-   {"MaximumVolumeParts", store_size64, ITEM(res_dev.max_vol_parts_num), 0, ITEM_DEFAULT, 0},
+   {"MaximumVolumeParts", store_pint32, ITEM(res_dev.max_vol_parts_num), 0, ITEM_DEFAULT, 0},
    {"MountPoint",            store_strname,ITEM(res_dev.mount_point), 0, 0, 0},
    {"MountCommand",          store_strname,ITEM(res_dev.mount_command), 0, 0, 0},
    {"UnmountCommand",        store_strname,ITEM(res_dev.unmount_command), 0, 0, 0},
diff --git a/bacula/src/stored/stored_conf.h b/bacula/src/stored/stored_conf.h
index 1cdd6de2b..67ffed3dc 100644
--- a/bacula/src/stored/stored_conf.h
+++ b/bacula/src/stored/stored_conf.h
@@ -266,7 +266,7 @@ public:
    int64_t max_job_spool_size;        /* Max spool size for any single job */
 
    int64_t max_part_size;             /* Max part size */
-   int64_t max_vol_parts_num;          /* Max number of parts in a cloud volume */
+   uint32_t max_vol_parts_num;        /* Max number of parts in a cloud volume */
    char *mount_point;                 /* Mount point for require mount devices */
    char *mount_command;               /* Mount command */
    char *unmount_command;             /* Unmount command */