summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2019-04-08 22:31:46 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2019-04-09 10:17:12 +0100
commitdc4f45eb6874331daec870dc1e4cfc3ac5c49311 (patch)
tree3e7d1bb2b2a82432ac6c2bb3f912f2b80a15702f /lib
parentfef5706e11dcfc72cc759242842d36e7c8dc5e31 (diff)
lib: Use nr_open not file-max for setting fd rlimit
Petri pointed out that the maximum allowed number of files per process is nr_open, not the system cap of file-max. Suggested-by: Petri Latvala <petri.latvala@intel.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110351 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Cc: Petri Latvala <petri.latvala@intel.com> Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/igt_aux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/igt_aux.c b/lib/igt_aux.c
index 266aa832..02f4defb 100644
--- a/lib/igt_aux.c
+++ b/lib/igt_aux.c
@@ -1595,7 +1595,7 @@ bool igt_allow_unlimited_files(void)
struct rlimit rlim;
unsigned nofile_rlim = 1024*1024;
- FILE *file = fopen("/proc/sys/fs/file-max", "r");
+ FILE *file = fopen("/proc/sys/fs/nr_open", "r");
if (file) {
igt_assert(fscanf(file, "%u", &nofile_rlim) == 1);
igt_info("System limit for open files is %u\n", nofile_rlim);