diff options
author | Anatol Pomozov <anatol.pomozov@gmail.com> | 2012-09-12 23:11:55 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-22 23:31:32 -0500 |
commit | 39b652527457452f09b35044fb4f8b3b0eabafdf (patch) | |
tree | acd8fda1d4e37c58c68fe0cfb9288d5d06e14441 /fs/pipe.c | |
parent | 1afc99beaf0fca3767d9b67789a7ae91c4f7a9c9 (diff) |
fs: Preserve error code in get_empty_filp(), part 2
Allocating a file structure in function get_empty_filp() might fail because
of several reasons:
- not enough memory for file structures
- operation is not allowed
- user is over its limit
Currently the function returns NULL in all cases and we loose the exact
reason of the error. All callers of get_empty_filp() assume that the function
can fail with ENFILE only.
Return error through pointer. Change all callers to preserve this error code.
[AV: cleaned up a bit, carved the get_empty_filp() part out into a separate commit
(things remaining here deal with alloc_file()), removed pipe(2) behaviour change]
Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com>
Reviewed-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/pipe.c')
-rw-r--r-- | fs/pipe.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1037,13 +1037,13 @@ int create_pipe_files(struct file **res, int flags) | |||
1037 | 1037 | ||
1038 | err = -ENFILE; | 1038 | err = -ENFILE; |
1039 | f = alloc_file(&path, FMODE_WRITE, &write_pipefifo_fops); | 1039 | f = alloc_file(&path, FMODE_WRITE, &write_pipefifo_fops); |
1040 | if (!f) | 1040 | if (IS_ERR(f)) |
1041 | goto err_dentry; | 1041 | goto err_dentry; |
1042 | 1042 | ||
1043 | f->f_flags = O_WRONLY | (flags & (O_NONBLOCK | O_DIRECT)); | 1043 | f->f_flags = O_WRONLY | (flags & (O_NONBLOCK | O_DIRECT)); |
1044 | 1044 | ||
1045 | res[0] = alloc_file(&path, FMODE_READ, &read_pipefifo_fops); | 1045 | res[0] = alloc_file(&path, FMODE_READ, &read_pipefifo_fops); |
1046 | if (!res[0]) | 1046 | if (IS_ERR(res[0])) |
1047 | goto err_file; | 1047 | goto err_file; |
1048 | 1048 | ||
1049 | path_get(&path); | 1049 | path_get(&path); |