diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-06 11:28:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-06 11:28:14 -0800 |
| commit | 087b019860cc6a202d20057752e1c7e32ee20015 (patch) | |
| tree | 91bd3e320ec282b5beacb7eb5d02ac3264a15e3b | |
| parent | 20f3963d8f48ae8309fbc777ef6787fd0a3f53c2 (diff) | |
| parent | 7e8631e8b9d4e9f698c09c7e7309c96249180ff9 (diff) | |
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()
| -rw-r--r-- | fs/ocfs2/cluster/tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index 97de0fbd9f78..a96044004064 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c @@ -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; |