From owner-p4-projects@FreeBSD.ORG Thu Oct 13 18:25:07 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 191161065674; Thu, 13 Oct 2011 18:25:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CFA7E1065670 for ; Thu, 13 Oct 2011 18:25:06 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id B91088FC0C for ; Thu, 13 Oct 2011 18:25:06 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p9DIP6HD023884 for ; Thu, 13 Oct 2011 18:25:06 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p9DIP6SF023881 for perforce@freebsd.org; Thu, 13 Oct 2011 18:25:06 GMT (envelope-from jhb@freebsd.org) Date: Thu, 13 Oct 2011 18:25:06 GMT Message-Id: <201110131825.p9DIP6SF023881@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 200163 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Oct 2011 18:25:07 -0000 http://p4web.freebsd.org/@@200163?ac=10 Change 200163 by jhb@jhb_jhbbsd on 2011/10/13 18:24:01 Fix the off_t handling in fallocate() and fadvise() to be big-endian friendly. Affected files ... .. //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_misc.c#3 edit .. //depot/projects/fadvise/sys/compat/freebsd32/syscalls.master#3 edit Differences ... ==== //depot/projects/fadvise/sys/compat/freebsd32/freebsd32_misc.c#3 (text+ko) ==== @@ -2811,8 +2811,8 @@ struct posix_fallocate_args ap; ap.fd = uap->fd; - ap.offset = (uap->offsetlo | ((off_t)uap->offsethi << 32)); - ap.len = (uap->lenlo | ((off_t)uap->lenhi << 32)); + ap.offset = PAIR32TO64(off_t, uap->offset); + ap.len = PAIR32TO64(off_t, uap->len); return (sys_posix_fallocate(td, &ap)); } @@ -2822,8 +2822,8 @@ struct fadvise_args ap; ap.fd = uap->fd; - ap.offset = (uap->offsetlo | ((off_t)uap->offsethi << 32)); - ap.len = (uap->lenlo | ((off_t)uap->lenhi << 32)); + ap.offset = PAIR32TO64(off_t, uap->offset); + ap.len = PAIR32TO64(off_t, uap->len); ap.advice = uap->advice; return (sys_fadvise(td, &ap)); } ==== //depot/projects/fadvise/sys/compat/freebsd32/syscalls.master#3 (text+ko) ==== @@ -989,9 +989,9 @@ size_t inbuflen, void *outbufp, \ size_t outbuflen); } 530 AUE_NULL STD { int freebsd32_posix_fallocate(int fd,\ - uint32_t offsetlo, uint32_t offsethi,\ - uint32_t lenlo, uint32_t lenhi); } + uint32_t offset1, uint32_t offset2,\ + uint32_t len1, uint32_t len2); } 531 AUE_NULL STD { int freebsd32_fadvise(int fd, \ - uint32_t offsetlo, uint32_t offsethi,\ - uint32_t lenlo, uint32_t lenhi, \ + uint32_t offset1, uint32_t offset2,\ + uint32_t len1, uint32_t len2, \ int advice); }