On Fri, Aug 16, 2013 at 12:31:59AM -0700, David Miller wrote:> From: Asias He <asias at redhat.com> > Date: Fri, 16 Aug 2013 09:27:43 +0800 > > > On Thu, Aug 15, 2013 at 02:07:40PM -0700, David Miller wrote: > >> From: Asias He <asias at redhat.com> > >> Date: Thu, 15 Aug 2013 11:20:16 +0800 > >> > >> > memcpy_fromiovec is moved to lib/iovec.c. No need to include > >> > linux/socket.h for it. > >> > > >> > Signed-off-by: Asias He <asias at redhat.com> > >> > >> You can't do this. > >> > >> Because this file doesn't include the header file that > >> provides the declaration, which is linux/uio.h > > > > vhost.c includes drivers/vhost/vhost.h. In drivers/vhost/vhost.h, we > > have linux/uio.h included. > > Nothing in vhost.h needs linux/uio.h right? That's very poor style, > include the header where the dependency exists which is vhost.cWe use 'struct iovec' in vhost.h which needs linux/uio.h, no? So, how about including linux/uio.h in both vhost.c and vhost.h. -- Asias
From: Asias He <asias at redhat.com> Date: Fri, 16 Aug 2013 17:27:43 +0800> On Fri, Aug 16, 2013 at 12:31:59AM -0700, David Miller wrote: >> From: Asias He <asias at redhat.com> >> Date: Fri, 16 Aug 2013 09:27:43 +0800 >> >> > On Thu, Aug 15, 2013 at 02:07:40PM -0700, David Miller wrote: >> >> From: Asias He <asias at redhat.com> >> >> Date: Thu, 15 Aug 2013 11:20:16 +0800 >> >> >> >> > memcpy_fromiovec is moved to lib/iovec.c. No need to include >> >> > linux/socket.h for it. >> >> > >> >> > Signed-off-by: Asias He <asias at redhat.com> >> >> >> >> You can't do this. >> >> >> >> Because this file doesn't include the header file that >> >> provides the declaration, which is linux/uio.h >> > >> > vhost.c includes drivers/vhost/vhost.h. In drivers/vhost/vhost.h, we >> > have linux/uio.h included. >> >> Nothing in vhost.h needs linux/uio.h right? That's very poor style, >> include the header where the dependency exists which is vhost.c > > We use 'struct iovec' in vhost.h which needs linux/uio.h, no? > > So, how about including linux/uio.h in both vhost.c and vhost.h.That sounds good.
Asias He
2013-Aug-19 01:23 UTC
[PATCH v2] vhost: Include linux/uio.h instead of linux/socket.h
memcpy_fromiovec is moved from net/core/iovec.c to lib/iovec.c. linux/uio.h provides the declaration for memcpy_fromiovec. Include linux/uio.h instead of inux/socket.h for it. Signed-off-by: Asias He <asias at redhat.com> --- drivers/vhost/vhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index e58cf00..448efe0 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -13,7 +13,7 @@ #include <linux/eventfd.h> #include <linux/vhost.h> -#include <linux/socket.h> /* memcpy_fromiovec */ +#include <linux/uio.h> #include <linux/mm.h> #include <linux/mmu_context.h> #include <linux/miscdevice.h> -- 1.8.3.1