The branch, master has been updated via 71b69b0 Revert "ctdb-common: Use SCHED_RESET_ON_FORK when setting SCHED_FIFO" from 7594165 s3:smbd: only pass UCF_PREP_CREATEFILE to filename_convert() if we may create a new file
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 71b69b0169dc6e2843325f1567f64b6acd43e6b8 Author: Amitay Isaacs <ami...@gmail.com> Date: Mon Oct 24 18:24:54 2016 +1100 Revert "ctdb-common: Use SCHED_RESET_ON_FORK when setting SCHED_FIFO" BUG: https://bugzilla.samba.org/show_bug.cgi?id=12392 Feature SCHED_RESET_ON_FORK is completely broken on RHEL6 and RHEL7 distributions. So do not rely on SCHED_RESET_ON_FORK for now. This reverts commit 1be8564e553ce044426dbe7b3987edf514832940. Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Martin Schwenke <mar...@meltin.net> Autobuild-User(master): Martin Schwenke <mart...@samba.org> Autobuild-Date(master): Tue Oct 25 11:28:28 CEST 2016 on sn-devel-144 ----------------------------------------------------------------------- Summary of changes: ctdb/common/system_util.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/ctdb/common/system_util.c b/ctdb/common/system_util.c index 9fc6c44..9e897c2 100644 --- a/ctdb/common/system_util.c +++ b/ctdb/common/system_util.c @@ -68,14 +68,10 @@ bool set_scheduler(void) #else /* no AIX */ #if HAVE_SCHED_SETSCHEDULER struct sched_param p; - int policy = SCHED_FIFO; p.sched_priority = 1; -#ifdef SCHED_RESET_ON_FORK - policy |= SCHED_RESET_ON_FORK; -#endif - if (sched_setscheduler(0, policy, &p) == -1) { + if (sched_setscheduler(0, SCHED_FIFO, &p) == -1) { DEBUG(DEBUG_CRIT,("Unable to set scheduler to SCHED_FIFO (%s)\n", strerror(errno))); return false; @@ -108,7 +104,6 @@ void reset_scheduler(void) #endif #else /* no AIX */ #if HAVE_SCHED_SETSCHEDULER -#ifndef SCHED_RESET_ON_FORK struct sched_param p; p.sched_priority = 0; @@ -117,7 +112,6 @@ void reset_scheduler(void) } #endif #endif -#endif } bool parse_ipv4(const char *s, unsigned port, struct sockaddr_in *sin) -- Samba Shared Repository