diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-11-15 10:34:22 (GMT) |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-11-15 10:34:22 (GMT) |
| commit | da63d20bfb12827dd7747a841ea27348af3abc0a (patch) | |
| tree | ba275a74d068f91b453c08b9bacf8afe9577db9b /fs/file.c | |
| parent | 55020c8056a83ef2181e4cddd39cb2b9f4b88c5a (diff) | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
| download | linux-da63d20bfb12827dd7747a841ea27348af3abc0a.tar.xz | |
Merge tag 'v3.7-rc5' into devicetree/next
Linux 3.7-rc5
Diffstat (limited to 'fs/file.c')
| -rw-r--r-- | fs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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); |