git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix build on some compilers
[pandora-kernel.git]
/
fs
/
anon_inodes.c
diff --git
a/fs/anon_inodes.c
b/fs/anon_inodes.c
index
977ef20
..
3662dd4
100644
(file)
--- a/
fs/anon_inodes.c
+++ b/
fs/anon_inodes.c
@@
-58,8
+58,9
@@
static struct dentry_operations anon_inodefs_dentry_operations = {
* of the file
*
* @name: [in] name of the "class" of the new file
* of the file
*
* @name: [in] name of the "class" of the new file
- * @fops [in] file operations for the new file
- * @priv [in] private data for the new file (will be file's private_data)
+ * @fops: [in] file operations for the new file
+ * @priv: [in] private data for the new file (will be file's private_data)
+ * @flags: [in] flags
*
* Creates a new file by hooking it on a single inode. This is useful for files
* that do not need to have a full-fledged inode in order to operate correctly.
*
* Creates a new file by hooking it on a single inode. This is useful for files
* that do not need to have a full-fledged inode in order to operate correctly.
@@
-68,7
+69,7
@@
static struct dentry_operations anon_inodefs_dentry_operations = {
* setup. Returns new descriptor or -error.
*/
int anon_inode_getfd(const char *name, const struct file_operations *fops,
* setup. Returns new descriptor or -error.
*/
int anon_inode_getfd(const char *name, const struct file_operations *fops,
- void *priv)
+ void *priv
, int flags
)
{
struct qstr this;
struct dentry *dentry;
{
struct qstr this;
struct dentry *dentry;
@@
-78,7
+79,7
@@
int anon_inode_getfd(const char *name, const struct file_operations *fops,
if (IS_ERR(anon_inode_inode))
return -ENODEV;
if (IS_ERR(anon_inode_inode))
return -ENODEV;
- error = get_unused_fd
(
);
+ error = get_unused_fd
_flags(flags
);
if (error < 0)
return error;
fd = error;
if (error < 0)
return error;
fd = error;
@@
-115,7
+116,7
@@
int anon_inode_getfd(const char *name, const struct file_operations *fops,
file->f_mapping = anon_inode_inode->i_mapping;
file->f_pos = 0;
file->f_mapping = anon_inode_inode->i_mapping;
file->f_pos = 0;
- file->f_flags = O_RDWR;
+ file->f_flags = O_RDWR
| (flags & O_NONBLOCK)
;
file->f_version = 0;
file->private_data = priv;
file->f_version = 0;
file->private_data = priv;