[openib-general] [PATCH][SDP] fix build error Re: [openib-commits] r2088 - gen2/trunk/src/linux-kernel/infiniband/ulp/sdp

Tom Duffy tduffy at sun.com
Wed Mar 30 12:30:43 PST 2005


On Wed, 2005-03-30 at 09:34 -0800, libor at openib.org wrote:
> Modified: gen2/trunk/src/linux-kernel/infiniband/ulp/sdp/sdp_recv.c
> ===================================================================
> --- gen2/trunk/src/linux-kernel/infiniband/ulp/sdp/sdp_recv.c	2005-03-30 17:33:13 UTC (rev 2087)
> +++ gen2/trunk/src/linux-kernel/infiniband/ulp/sdp/sdp_recv.c	2005-03-30 17:34:12 UTC (rev 2088)
> @@ -670,7 +670,7 @@
>  
>  		copy = min((PAGE_SIZE - offset),
>  			   (unsigned long)(buff->tail - buff->data));
> -
> +		copy = min(iocb->len, copy);
>  #ifndef _SDP_DATA_PATH_NULL
>  		memcpy((addr + offset), buff->data, copy);
>  #endif

Signed-off-by: Tom Duffy <tduffy at sun.com>

Index: drivers/infiniband/ulp/sdp/sdp_recv.c
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_recv.c	(revision 2093)
+++ drivers/infiniband/ulp/sdp/sdp_recv.c	(working copy)
@@ -670,7 +670,7 @@ static int sdp_read_buff_iocb(struct sdp
 
 		copy = min((PAGE_SIZE - offset),
 			   (unsigned long)(buff->tail - buff->data));
-		copy = min(iocb->len, copy);
+		copy = min((unsigned long)iocb->len, copy);
 #ifndef _SDP_DATA_PATH_NULL
 		memcpy((addr + offset), buff->data, copy);
 #endif




More information about the general mailing list