diff options
| author | Anatol Pomozov <anatol.pomozov@gmail.com> | 2012-09-12 20:11:55 -0700 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-22 23:31:32 -0500 |
| commit | 39b652527457452f09b35044fb4f8b3b0eabafdf (patch) | |
| tree | acd8fda1d4e37c58c68fe0cfb9288d5d06e14441 /fs/file_table.c | |
| parent | 1afc99beaf0fca3767d9b67789a7ae91c4f7a9c9 (diff) | |
| download | kernel-common-39b652527457452f09b35044fb4f8b3b0eabafdf.tar.gz kernel-common-39b652527457452f09b35044fb4f8b3b0eabafdf.tar.bz2 kernel-common-39b652527457452f09b35044fb4f8b3b0eabafdf.zip | |
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/file_table.c')
| -rw-r--r-- | fs/file_table.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/file_table.c b/fs/file_table.c index cd76d4fdf4a4..aa07d3684a2e 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -173,7 +173,7 @@ struct file *alloc_file(struct path *path, fmode_t mode, file = get_empty_filp(); if (IS_ERR(file)) - return NULL; + return file; file->f_path = *path; file->f_mapping = path->dentry->d_inode->i_mapping; |