alloc_file(): switch to passing O_... flags instead of FMODE_... mode
... so that it could set both ->f_flags and ->f_mode, without callers having to set ->f_flags manually. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@@ -411,7 +411,7 @@ struct file *sock_alloc_file(struct socket *sock, int flags, const char *dname)
|
||||
|
||||
d_instantiate(path.dentry, SOCK_INODE(sock));
|
||||
|
||||
file = alloc_file(&path, FMODE_READ | FMODE_WRITE,
|
||||
file = alloc_file(&path, O_RDWR | (flags & O_NONBLOCK),
|
||||
&socket_file_ops);
|
||||
if (IS_ERR(file)) {
|
||||
/* drop dentry, keep inode for a bit */
|
||||
@@ -423,7 +423,6 @@ struct file *sock_alloc_file(struct socket *sock, int flags, const char *dname)
|
||||
}
|
||||
|
||||
sock->file = file;
|
||||
file->f_flags = O_RDWR | (flags & O_NONBLOCK);
|
||||
file->private_data = sock;
|
||||
return file;
|
||||
}
|
||||
|
Reference in New Issue
Block a user