Page MenuHomeFreeBSD
Files F173172183

D32994.id.diff
No OneTemporary
Actions

D32994.id.diff
View Options

diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h
--- a/sys/compat/freebsd32/freebsd32.h
+++ b/sys/compat/freebsd32/freebsd32.h
@@ -458,9 +458,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_ */
diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c
--- a/sys/compat/freebsd32/freebsd32_misc.c
+++ b/sys/compat/freebsd32/freebsd32_misc.c
@@ -3893,37 +3893,3 @@
sizeof(hostid), NULL, 0));
}
#endif
-
-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);
-}
diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h
--- a/sys/compat/freebsd32/freebsd32_proto.h
+++ b/sys/compat/freebsd32/freebsd32_proto.h
@@ -772,13 +772,6 @@
struct freebsd32_aio_readv_args {
char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)];
};
-struct freebsd32_fspacectl_args {
- char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
- char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
- char rqsr_l_[PADL_(const struct spacectl_range32 *)]; const struct spacectl_range32 * rqsr; char rqsr_r_[PADR_(const struct spacectl_range32 *)];
- char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
- char rmsr_l_[PADL_(struct spacectl_range32 *)]; struct spacectl_range32 * rmsr; char rmsr_r_[PADR_(struct spacectl_range32 *)];
-};
#if !defined(PAD64_REQUIRED) && !defined(__amd64__)
#define PAD64_REQUIRED
#endif
@@ -929,7 +922,6 @@
int freebsd32___sysctlbyname(struct thread *, struct freebsd32___sysctlbyname_args *);
int freebsd32_aio_writev(struct thread *, struct freebsd32_aio_writev_args *);
int freebsd32_aio_readv(struct thread *, struct freebsd32_aio_readv_args *);
-int freebsd32_fspacectl(struct thread *, struct freebsd32_fspacectl_args *);
#ifdef COMPAT_43
@@ -1560,7 +1552,6 @@
#define FREEBSD32_SYS_AUE_freebsd32___sysctlbyname AUE_SYSCTL
#define FREEBSD32_SYS_AUE_freebsd32_aio_writev AUE_AIO_WRITEV
#define FREEBSD32_SYS_AUE_freebsd32_aio_readv AUE_AIO_READV
-#define FREEBSD32_SYS_AUE_freebsd32_fspacectl AUE_FSPACECTL
#undef PAD_
#undef PADL_
diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h
--- a/sys/compat/freebsd32/freebsd32_syscall.h
+++ b/sys/compat/freebsd32/freebsd32_syscall.h
@@ -512,6 +512,6 @@
#define FREEBSD32_SYS___specialfd 577
#define FREEBSD32_SYS_freebsd32_aio_writev 578
#define FREEBSD32_SYS_freebsd32_aio_readv 579
-#define FREEBSD32_SYS_freebsd32_fspacectl 580
+#define FREEBSD32_SYS_fspacectl 580
#define FREEBSD32_SYS_sched_getcpu 581
#define FREEBSD32_SYS_MAXSYSCALL 582
diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c
--- a/sys/compat/freebsd32/freebsd32_syscalls.c
+++ b/sys/compat/freebsd32/freebsd32_syscalls.c
@@ -621,6 +621,6 @@
"__specialfd", /* 577 = __specialfd */
"freebsd32_aio_writev", /* 578 = freebsd32_aio_writev */
"freebsd32_aio_readv", /* 579 = freebsd32_aio_readv */
- "freebsd32_fspacectl", /* 580 = freebsd32_fspacectl */
+ "fspacectl", /* 580 = fspacectl */
"sched_getcpu", /* 581 = sched_getcpu */
};
diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c
--- a/sys/compat/freebsd32/freebsd32_sysent.c
+++ b/sys/compat/freebsd32/freebsd32_sysent.c
@@ -674,6 +674,6 @@
{ .sy_narg = AS(__specialfd_args), .sy_call = (sy_call_t *)sys___specialfd, .sy_auevent = AUE_SPECIALFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 577 = __specialfd */
{ .sy_narg = AS(freebsd32_aio_writev_args), .sy_call = (sy_call_t *)freebsd32_aio_writev, .sy_auevent = AUE_AIO_WRITEV, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 578 = freebsd32_aio_writev */
{ .sy_narg = AS(freebsd32_aio_readv_args), .sy_call = (sy_call_t *)freebsd32_aio_readv, .sy_auevent = AUE_AIO_READV, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 579 = freebsd32_aio_readv */
- { .sy_narg = AS(freebsd32_fspacectl_args), .sy_call = (sy_call_t *)freebsd32_fspacectl, .sy_auevent = AUE_FSPACECTL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 580 = freebsd32_fspacectl */
+ { .sy_narg = AS(fspacectl_args), .sy_call = (sy_call_t *)sys_fspacectl, .sy_auevent = AUE_FSPACECTL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 580 = fspacectl */
{ .sy_narg = 0, .sy_call = (sy_call_t *)sys_sched_getcpu, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 581 = sched_getcpu */
};
diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c
--- a/sys/compat/freebsd32/freebsd32_systrace_args.c
+++ b/sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -3446,14 +3446,14 @@
*n_args = 1;
break;
}
- /* freebsd32_fspacectl */
+ /* fspacectl */
case 580: {
- struct freebsd32_fspacectl_args *p = params;
+ struct fspacectl_args *p = params;
iarg[0] = p->fd; /* int */
iarg[1] = p->cmd; /* int */
- uarg[2] = (intptr_t)p->rqsr; /* const struct spacectl_range32 * */
+ uarg[2] = (intptr_t)p->rqsr; /* const struct spacectl_range * */
iarg[3] = p->flags; /* int */
- uarg[4] = (intptr_t)p->rmsr; /* struct spacectl_range32 * */
+ uarg[4] = (intptr_t)p->rmsr; /* struct spacectl_range * */
*n_args = 5;
break;
}
@@ -9305,7 +9305,7 @@
break;
};
break;
- /* freebsd32_fspacectl */
+ /* fspacectl */
case 580:
switch (ndx) {
case 0:
@@ -9315,13 +9315,13 @@
p = "int";
break;
case 2:
- p = "userland const struct spacectl_range32 *";
+ p = "userland const struct spacectl_range *";
break;
case 3:
p = "int";
break;
case 4:
- p = "userland struct spacectl_range32 *";
+ p = "userland struct spacectl_range *";
break;
default:
break;
@@ -11272,7 +11272,7 @@
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* freebsd32_fspacectl */
+ /* fspacectl */
case 580:
if (ndx == 0 || ndx == 1)
p = "int";
diff --git a/sys/compat/freebsd32/syscalls.master b/sys/compat/freebsd32/syscalls.master
--- a/sys/compat/freebsd32/syscalls.master
+++ b/sys/compat/freebsd32/syscalls.master
@@ -1199,10 +1199,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

File Metadata

Mime Type
text/plain
Expires
Fri, Sep 25, 2:29 AM (17 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
39569484
Default Alt Text
D32994.id.diff (7 KB)

Event Timeline