Index: sys/compat/freebsd32/freebsd32.h =================================================================== --- sys/compat/freebsd32/freebsd32.h +++ sys/compat/freebsd32/freebsd32.h @@ -435,9 +435,4 @@ uint32_t pc_limit1, pc_limit2; }; -struct spacectl_range32 { - uint32_t r_offset1, r_offset2; - uint32_t r_len1, r_len2; -}; - #endif /* !_COMPAT_FREEBSD32_FREEBSD32_H_ */ Index: sys/compat/freebsd32/freebsd32_misc.c =================================================================== --- sys/compat/freebsd32/freebsd32_misc.c +++ sys/compat/freebsd32/freebsd32_misc.c @@ -3854,37 +3854,3 @@ } return (error); } - -int -freebsd32_fspacectl(struct thread *td, struct freebsd32_fspacectl_args *uap) -{ - struct spacectl_range rqsr, rmsr; - struct spacectl_range32 rqsr32, rmsr32; - int error, cerror; - - error = copyin(uap->rqsr, &rqsr32, sizeof(rqsr32)); - if (error != 0) - return (error); - rqsr.r_offset = PAIR32TO64(off_t, rqsr32.r_offset); - rqsr.r_len = PAIR32TO64(off_t, rqsr32.r_len); - - error = kern_fspacectl(td, uap->fd, uap->cmd, &rqsr, uap->flags, - &rmsr); - if (uap->rmsr != NULL) { -#if BYTE_ORDER == LITTLE_ENDIAN - rmsr32.r_offset1 = rmsr.r_offset; - rmsr32.r_offset2 = rmsr.r_offset >> 32; - rmsr32.r_len1 = rmsr.r_len; - rmsr32.r_len2 = rmsr.r_len >> 32; -#else - rmsr32.r_offset1 = rmsr.r_offset >> 32; - rmsr32.r_offset2 = rmsr.r_offset; - rmsr32.r_len1 = rmsr.r_len >> 32; - rmsr32.r_len2 = rmsr.r_len; -#endif - cerror = copyout(&rmsr32, uap->rmsr, sizeof(rmsr32)); - if (error == 0) - error = cerror; - } - return (error); -} Index: sys/compat/freebsd32/syscalls.master =================================================================== --- sys/compat/freebsd32/syscalls.master +++ sys/compat/freebsd32/syscalls.master @@ -1176,10 +1176,10 @@ struct aiocb32 *aiocbp); } 579 AUE_AIO_READV STD { int freebsd32_aio_readv( \ struct aiocb32 *aiocbp); } -580 AUE_FSPACECTL STD { int freebsd32_fspacectl(int fd, \ +580 AUE_FSPACECTL NOPROTO { int fspacectl(int fd, \ int cmd, \ - const struct spacectl_range32 *rqsr, \ + const struct spacectl_range *rqsr, \ int flags, \ - struct spacectl_range32 *rmsr); } + struct spacectl_range *rmsr); } 581 AUE_NULL NOPROTO { int sched_getcpu(void); } ; vim: syntax=off