Merge tag 'amdkfd-fixes-2014-12-30' of git://people.freedesktop.org/~gabbayo/linux...

[cascardo/linux.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 70bbde6..a2c33a4 100644 (file)
--- 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);