summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAnatol Pomozov <anatol.pomozov@gmail.com>2012-09-12 20:11:55 -0700
committerAl Viro <viro@zeniv.linux.org.uk>2013-02-22 23:31:32 -0500
commit39b652527457452f09b35044fb4f8b3b0eabafdf (patch)
treeacd8fda1d4e37c58c68fe0cfb9288d5d06e14441 /mm
parent1afc99beaf0fca3767d9b67789a7ae91c4f7a9c9 (diff)
downloadop-kernel-dev-39b652527457452f09b35044fb4f8b3b0eabafdf.zip
op-kernel-dev-39b652527457452f09b35044fb4f8b3b0eabafdf.tar.gz
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 'mm')
-rw-r--r--mm/shmem.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/shmem.c b/mm/shmem.c
index 814d554..abf07f7 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2913,10 +2913,10 @@ struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags
goto put_dentry;
#endif
- error = -ENFILE;
file = alloc_file(&path, FMODE_WRITE | FMODE_READ,
&shmem_file_operations);
- if (!file)
+ error = PTR_ERR(file);
+ if (IS_ERR(file))
goto put_dentry;
return file;
OpenPOWER on IntegriCloud