summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGarming Sam <garming@catalyst.net.nz>2014-02-04 15:09:12 +1300
committerJeremy Allison <jra@samba.org>2014-02-07 16:19:16 -0800
commitfe9974ca45ec6d9a43d70cea3bd28243e43f785e (patch)
treeb6ef785197ff2f778d94b280a32698215cc93684
parente3052c5bd94de2ae282c124685f17f5632e14b29 (diff)
downloadsamba-fe9974ca45ec6d9a43d70cea3bd28243e43f785e.tar.gz
samba-fe9974ca45ec6d9a43d70cea3bd28243e43f785e.tar.xz
samba-fe9974ca45ec6d9a43d70cea3bd28243e43f785e.zip
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>
-rw-r--r--lib/param/param_functions.c2
-rw-r--r--lib/param/param_table.c2
-rw-r--r--source3/smbd/dfree.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index fd8337e6b7..f6d79fb863 100644
--- 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(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)
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index efb318548e..82fad33443 100644
--- 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,
- .offset = GLOBAL_VAR(maxdisksize),
+ .offset = GLOBAL_VAR(max_disk_size),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
diff --git a/source3/smbd/dfree.c b/source3/smbd/dfree.c
index e6a0af2185..d02c1bd66a 100644
--- 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 */
- 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;