Commit 087b0198 authored Nov 06, 2014 by Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull another filesystem fix from Al Viro:
 "A fix for embarrassing braino in o2net_send_tcp_msg().  -stable
  fodder..."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix breakage in o2net_send_tcp_msg()

parents 20f3963d 7e8631e8

fs/ocfs2/cluster/tcp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -925,7 +925,7 @@ static int o2net_send_tcp_msg(struct socket sock, struct kvec vec,
		size_t veclen, size_t total)
		{
		int ret;
		struct msghdr msg;
		struct msghdr msg = {.msg_flags = 0,};

		if (sock == NULL) {
		ret = -EINVAL;