param: rename lp function and variable from "maxdisksize" to "max_disk_size"

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index fd8337e6b7a45028c198e57b419613dd1203b375..f6d79fb8630a59fd71f63e0ff80999f9ea446766 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -310,7 +310,7 @@ FN_GLOBAL_INTEGER(lpq_cache_time, lpq_cache_time)
 FN_GLOBAL_INTEGER(machine_password_timeout, machine_password_timeout)
 FN_GLOBAL_INTEGER(mangle_prefix, mangle_prefix)
 FN_GLOBAL_INTEGER(map_to_guest, map_to_guest)
 FN_GLOBAL_INTEGER(machine_password_timeout, machine_password_timeout)
 FN_GLOBAL_INTEGER(mangle_prefix, mangle_prefix)
 FN_GLOBAL_INTEGER(map_to_guest, map_to_guest)

-FN_GLOBAL_INTEGER(maxdisksize, maxdisksize)
+FN_GLOBAL_INTEGER(max_disk_size, max_disk_size)

 FN_GLOBAL_INTEGER(max_log_size, max_log_size)
 FN_GLOBAL_INTEGER(max_mux, max_mux)
 FN_GLOBAL_INTEGER(max_open_files, max_open_files)
 FN_GLOBAL_INTEGER(max_log_size, max_log_size)
 FN_GLOBAL_INTEGER(max_mux, max_mux)
 FN_GLOBAL_INTEGER(max_open_files, max_open_files)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index efb318548e66708302d5b639577b08bdf0c1eded..82fad33443ee8f9f2a531c63db560ccb4696a6be 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -1821,7 +1821,7 @@ static struct parm_struct parm_table[] = {
                .label          = "max disk size",
                .type           = P_BYTES,
                .p_class        = P_GLOBAL,
                .label          = "max disk size",
                .type           = P_BYTES,
                .p_class        = P_GLOBAL,

-               .offset         = GLOBAL_VAR(maxdisksize),
+               .offset         = GLOBAL_VAR(max_disk_size),

                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,

diff --git a/source3/smbd/dfree.c b/source3/smbd/dfree.c
index e6a0af218592b9902b1ffd0b51638e832f8374af..d02c1bd66a6cc006097466c6323a1715c1cdd80a 100644 (file)
--- a/source3/smbd/dfree.c
+++ b/source3/smbd/dfree.c
@@ -28,7 +28,7 @@
 void disk_norm(bool small_query, uint64_t *bsize,uint64_t *dfree,uint64_t *dsize)
 {
        /* check if the disk is beyond the max disk size */
 void disk_norm(bool small_query, uint64_t *bsize,uint64_t *dfree,uint64_t *dsize)
 {
        /* check if the disk is beyond the max disk size */

-       uint64_t maxdisksize = lp_maxdisksize();
+       uint64_t maxdisksize = lp_max_disk_size();

        if (maxdisksize) {
                /* convert to blocks - and don't overflow */
                maxdisksize = ((maxdisksize*1024)/(*bsize))*1024;
        if (maxdisksize) {
                /* convert to blocks - and don't overflow */
                maxdisksize = ((maxdisksize*1024)/(*bsize))*1024;