projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench...
[linux-2.6-block.git]
/
fs
/
fcntl.c
diff --git
a/fs/fcntl.c
b/fs/fcntl.c
index 97e01dc0d95fc4fe8464d729ce94d32b888b567d..452d02f9075ea19861d6d6bd00de12afd19a65eb 100644
(file)
--- a/
fs/fcntl.c
+++ b/
fs/fcntl.c
@@
-344,7
+344,7
@@
static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
switch (cmd) {
case F_DUPFD:
case F_DUPFD_CLOEXEC:
- if (arg >=
current->signal->rlim[RLIMIT_NOFILE].rlim_cur
)
+ if (arg >=
rlimit(RLIMIT_NOFILE)
)
break;
err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
if (err >= 0) {