aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-12-19 07:11:56 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2014-12-19 07:13:21 -0500
commite3bb504efd919f7bacd24cb14038953899b909e1 (patch)
tree6b06f0cde7a693b23508e7b6d3f0295d313e1904
parent9d4d65748a5ca26ea8650e50ba521295549bf4e3 (diff)
downloadlinux-linaro-stable-e3bb504efd919f7bacd24cb14038953899b909e1.tar.gz
[regression] chunk lost from bd9b51
Reported-by: Pavel Emelyanov <xemul@parallels.com> Acked-by: Pavel Emelyanov <xemul@parallels.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--net/socket.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c
index 70bbde65e4ca..a2c33a4dc7ba 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -372,7 +372,6 @@ struct file *sock_alloc_file(struct socket *sock, int flags, const char *dname)
path.mnt = mntget(sock_mnt);
d_instantiate(path.dentry, SOCK_INODE(sock));
- SOCK_INODE(sock)->i_fop = &socket_file_ops;
file = alloc_file(&path, FMODE_READ | FMODE_WRITE,
&socket_file_ops);