diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-11-07 17:59:14 -0600 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-11-07 17:59:14 -0600 |
| commit | d3ad4a60a1b1448e59914eebefe1ccc8e64f9e2f (patch) | |
| tree | f0862d1905a599cdbad86fcc8816d86a6f33459f /fs/file.c | |
| parent | e095c0d122c09efabe7d4136ce77f72c636c4879 (diff) | |
| parent | e5c5f2adeb370559f4b221d57214db85858b786a (diff) | |
Merge remote-tracking branch 'arm-soc/devel/debug_ll_init' into debug_ll
Diffstat (limited to 'fs/file.c')
| -rw-r--r-- | fs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/file.c b/fs/file.c index d3b5fa80b71b..708d997a7748 100644 --- a/fs/file.c +++ b/fs/file.c @@ -900,7 +900,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags) return __close_fd(files, fd); if (fd >= rlimit(RLIMIT_NOFILE)) - return -EMFILE; + return -EBADF; spin_lock(&files->file_lock); err = expand_files(files, fd); @@ -926,7 +926,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags) return -EINVAL; if (newfd >= rlimit(RLIMIT_NOFILE)) - return -EMFILE; + return -EBADF; spin_lock(&files->file_lock); err = expand_files(files, newfd); |