lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SPARC]: avoid CHILD_MAX and OPEN_MAX constants

Browse Source 
I don't figure anyone really cares about SunOS syscall emulation, and I
certainly don't.  But I'm getting rid of uses of the OPEN_MAX and CHILD_MAX
compile-time constant, and these are almost the only ones.  OPEN_MAX is a
bogus constant with no meaning about anything.  The RLIMIT_NOFILE resource
limit is what sysconf (_SC_OPEN_MAX) actually wants to return.

The CHILD_MAX cases weren't actually using anything I want to get rid of,
but I noticed that they are there and are wrong too.  The CHILD_MAX value
is not really unlimited as a -1 return from sysconf indicates.  The
RLIMIT_NPROC resource limit is what sysconf (_SC_CHILD_MAX) wants to return.

Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Roland McGrath
2007-04-12 13:13:42 -07:00
committed by David S. Miller
parent 2f3a2efd85
commit 1d51c69fb6
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sparc/kernel/sys_sunos.c
View File

@@ -910,7 +910,7 @@ asmlinkage long sunos_sysconf (int name)
ret = ARG_MAX; ret = ARG_MAX;
break; break;
case _SC_CHILD_MAX: case _SC_CHILD_MAX:
ret = -1; /* no limit */ ret = current->signal->rlim[RLIMIT_NPROC].rlim_cur;
break; break;
case _SC_CLK_TCK: case _SC_CLK_TCK:
ret = HZ; ret = HZ;
@@ -919,7 +919,7 @@ asmlinkage long sunos_sysconf (int name)
ret = NGROUPS_MAX; ret = NGROUPS_MAX;
break; break;
case _SC_OPEN_MAX: case _SC_OPEN_MAX:
ret = OPEN_MAX; ret = current->signal->rlim[RLIMIT_NOFILE].rlim_cur;
break; break;
case _SC_JOB_CONTROL: case _SC_JOB_CONTROL:
ret = 1; /* yes, we do support job control */ ret = 1; /* yes, we do support job control */

4
arch/sparc64/kernel/sys_sunos32.c
View File

@@ -871,7 +871,7 @@ asmlinkage s32 sunos_sysconf (int name)
ret = ARG_MAX; ret = ARG_MAX;
break; break;
case _SC_CHILD_MAX: case _SC_CHILD_MAX:
ret = -1; /* no limit */ ret = current->signal->rlim[RLIMIT_NPROC].rlim_cur;
break; break;
case _SC_CLK_TCK: case _SC_CLK_TCK:
ret = HZ; ret = HZ;
@@ -880,7 +880,7 @@ asmlinkage s32 sunos_sysconf (int name)
ret = NGROUPS_MAX; ret = NGROUPS_MAX;
break; break;
case _SC_OPEN_MAX: case _SC_OPEN_MAX:
ret = OPEN_MAX; ret = current->signal->rlim[RLIMIT_NOFILE].rlim_cur;
break; break;
case _SC_JOB_CONTROL: case _SC_JOB_CONTROL:
ret = 1; /* yes, we do support job control */ ret = 1; /* yes, we do support job control */

6
arch/sparc64/solaris/misc.c
View File

@@ -363,8 +363,10 @@ asmlinkage int solaris_sysconf(int id)
{ {
switch (id) { switch (id) {
case SOLARIS_CONFIG_NGROUPS: return NGROUPS_MAX; case SOLARIS_CONFIG_NGROUPS: return NGROUPS_MAX;
case SOLARIS_CONFIG_CHILD_MAX: return -1; /* no limit */ case SOLARIS_CONFIG_CHILD_MAX:
case SOLARIS_CONFIG_OPEN_FILES: return OPEN_MAX; return current->signal->rlim[RLIMIT_NPROC].rlim_cur;
case SOLARIS_CONFIG_OPEN_FILES:
return current->signal->rlim[RLIMIT_NOFILE].rlim_cur;
case SOLARIS_CONFIG_POSIX_VER: return 199309; case SOLARIS_CONFIG_POSIX_VER: return 199309;
case SOLARIS_CONFIG_PAGESIZE: return PAGE_SIZE; case SOLARIS_CONFIG_PAGESIZE: return PAGE_SIZE;
case SOLARIS_CONFIG_XOPEN_VER: return 3; case SOLARIS_CONFIG_XOPEN_VER: return 3;