[Cluster-devel] [PATCH 6/7] [DLM] fix iovec length in recvmsg

Steven Whitehouse swhiteho at redhat.com
Thu Oct 12 17:19:20 UTC 2006


>From 4c5e1b1a8c3f591b21f09001d6748296ddff33b8 Mon Sep 17 00:00:00 2001
From: Patrick Caulfield <pcaulfie at redhat.com>
Date: Thu, 12 Oct 2006 10:41:22 +0100
Subject: [DLM] fix iovec length in recvmsg

The DLM always passes the iovec length as 1, this is wrong when the circular
buffer wraps round.

Signed-Off-By: Patrick Caulfield <pcaulfie at redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho at redhat.com>
---
 fs/dlm/lowcomms.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 7bcea7c..867f93d 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -548,7 +548,7 @@ static int receive_from_sock(void)
 	}
 	len = iov[0].iov_len + iov[1].iov_len;
 
-	r = ret = kernel_recvmsg(sctp_con.sock, &msg, iov, 1, len,
+	r = ret = kernel_recvmsg(sctp_con.sock, &msg, iov, msg.msg_iovlen, len,
 				 MSG_NOSIGNAL | MSG_DONTWAIT);
 	if (ret <= 0)
 		goto out_close;
-- 
1.4.1






More information about the Cluster-devel mailing list