diff --git a/[refs] b/[refs] index 2b84ede9f9c7..53bb8809d01e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf0d52492d82ad70684e17c8a46942c13d0e140e +refs/heads/master: 1e38bb3a38d08129d08c904b10ea3ba08e22d297 diff --git a/trunk/net/socket.c b/trunk/net/socket.c index 4147fe4bf41d..d6f27ed9ba6c 100644 --- a/trunk/net/socket.c +++ b/trunk/net/socket.c @@ -254,7 +254,6 @@ static struct inode *sock_alloc_inode(struct super_block *sb) ei->socket.ops = NULL; ei->socket.sk = NULL; ei->socket.file = NULL; - ei->socket.flags = 0; return &ei->vfs_inode; }