diff options
author | Jiri Slaby <jslaby@suse.cz> | 2010-03-05 16:42:42 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-06 14:26:29 -0500 |
commit | d554ed895dc8f293cc712c71f14b101ace82579a (patch) | |
tree | fd29ba33d640e156e2ca4267ffbdb9dc566fd3d6 /fs/file.c | |
parent | 221e3ebf6d5f2625373573155924e39f196c5d3d (diff) |
fs: use rlimit helpers
Make sure compiler won't do weird things with limits. E.g. fetching them
twice may return 2 different values after writable limits are implemented.
I.e. either use rlimit helpers added in commit 3e10e716abf3 ("resource:
add helpers for fetching rlimits") or ACCESS_ONCE if not applicable.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/file.c')
-rw-r--r-- | fs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -257,7 +257,7 @@ int expand_files(struct files_struct *files, int nr) | |||
257 | * N.B. For clone tasks sharing a files structure, this test | 257 | * N.B. For clone tasks sharing a files structure, this test |
258 | * will limit the total number of files that can be opened. | 258 | * will limit the total number of files that can be opened. |
259 | */ | 259 | */ |
260 | if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) | 260 | if (nr >= rlimit(RLIMIT_NOFILE)) |
261 | return -EMFILE; | 261 | return -EMFILE; |
262 | 262 | ||
263 | /* Do we need to expand? */ | 263 | /* Do we need to expand? */ |