diff options
| -rw-r--r-- | lib/param/loadparm.c | 94 |
1 files changed, 89 insertions, 5 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index a17036d09b..b3f73e661a 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -945,6 +945,17 @@ static struct parm_struct parm_table[] = { .flags = FLAG_ADVANCED, }, + {N_("Locking Options"), P_SEP, P_SEPARATOR}, + + { + .label = "blocking locks", + .type = P_BOOL, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(bBlockingLocks), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, { .label = "csc policy", .type = P_ENUM, @@ -954,14 +965,41 @@ static struct parm_struct parm_table[] = { .enum_list = enum_csc_policy, .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, }, - { - .label = "strict locking", + .label = "fake oplocks", .type = P_BOOL, .p_class = P_LOCAL, - .offset = LOCAL_VAR(iStrictLocking), + .offset = LOCAL_VAR(bFakeOplocks), .special = NULL, - .enum_list = NULL + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE, + }, + { + .label = "kernel oplocks", + .type = P_BOOL, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(bKernelOplocks), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "locking", + .type = P_BOOL, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(bLocking), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "lock spin time", + .type = P_INTEGER, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(iLockSpinTime), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_GLOBAL, }, { .label = "oplocks", @@ -969,7 +1007,53 @@ static struct parm_struct parm_table[] = { .p_class = P_LOCAL, .offset = LOCAL_VAR(bOpLocks), .special = NULL, - .enum_list = NULL + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "level2 oplocks", + .type = P_BOOL, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(bLevel2OpLocks), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "oplock break wait time", + .type = P_INTEGER, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(oplock_break_wait_time), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_GLOBAL, + }, + { + .label = "oplock contention limit", + .type = P_INTEGER, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(iOplockContentionLimit), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "posix locking", + .type = P_BOOL, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(bPosixLocking), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, + }, + { + .label = "strict locking", + .type = P_ENUM, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(iStrictLocking), + .special = NULL, + .enum_list = enum_bool_auto, + .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL, }, {N_("Ldap Options"), P_SEP, P_SEPARATOR}, |