From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 19 Dec 2014 12:11:56 +0000 (-0500)
Subject: [regression] chunk lost from bd9b51
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e3bb504efd919f7bacd24cb14038953899b909e1;p=deliverable%2Flinux.git

[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>
---

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);