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/fcntl.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/fcntl.c')
-rw-r--r-- | fs/fcntl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c index 97e01dc0d95f..452d02f9075e 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c | |||
@@ -344,7 +344,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg, | |||
344 | switch (cmd) { | 344 | switch (cmd) { |
345 | case F_DUPFD: | 345 | case F_DUPFD: |
346 | case F_DUPFD_CLOEXEC: | 346 | case F_DUPFD_CLOEXEC: |
347 | if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) | 347 | if (arg >= rlimit(RLIMIT_NOFILE)) |
348 | break; | 348 | break; |
349 | err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0); | 349 | err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0); |
350 | if (err >= 0) { | 350 | if (err >= 0) { |