Page MenuHomeFreeBSD
Files F132587181

D25636.id.diff
No OneTemporary
Actions

D25636.id.diff
View Options

Index: head/sys/amd64/linux/linux_dummy.c
===================================================================
--- head/sys/amd64/linux/linux_dummy.c
+++ head/sys/amd64/linux/linux_dummy.c
@@ -105,7 +105,6 @@
DUMMY(migrate_pages);
DUMMY(unshare);
/* Linux 2.6.17: */
-DUMMY(splice);
DUMMY(tee);
DUMMY(vmsplice);
/* Linux 2.6.18: */
Index: head/sys/amd64/linux/syscalls.master
===================================================================
--- head/sys/amd64/linux/syscalls.master
+++ head/sys/amd64/linux/syscalls.master
@@ -1612,7 +1612,14 @@
);
}
275 AUE_NULL STD {
- int linux_splice(void);
+ int linux_splice(
+ int fd_in,
+ l_loff_t *off_in,
+ int fd_out,
+ l_loff_t *off_out,
+ l_size_t len,
+ l_uint flags
+ );
}
276 AUE_NULL STD {
int linux_tee(void);
Index: head/sys/amd64/linux32/linux32_dummy.c
===================================================================
--- head/sys/amd64/linux32/linux32_dummy.c
+++ head/sys/amd64/linux32/linux32_dummy.c
@@ -102,7 +102,6 @@
DUMMY(migrate_pages);
DUMMY(unshare);
/* Linux 2.6.17: */
-DUMMY(splice);
DUMMY(tee);
DUMMY(vmsplice);
/* Linux 2.6.18: */
Index: head/sys/amd64/linux32/syscalls.master
===================================================================
--- head/sys/amd64/linux32/syscalls.master
+++ head/sys/amd64/linux32/syscalls.master
@@ -1731,7 +1731,14 @@
);
}
313 AUE_NULL STD {
- int linux_splice(void);
+ int linux_splice(
+ int fd_in,
+ l_loff_t *off_in,
+ int fd_out,
+ l_loff_t *off_out,
+ l_size_t len,
+ l_uint flags
+ );
}
314 AUE_NULL STD {
int linux_sync_file_range(
Index: head/sys/arm64/linux/linux_dummy.c
===================================================================
--- head/sys/arm64/linux/linux_dummy.c
+++ head/sys/arm64/linux/linux_dummy.c
@@ -98,7 +98,6 @@
DUMMY(migrate_pages);
DUMMY(unshare);
/* Linux 2.6.17: */
-DUMMY(splice);
DUMMY(tee);
DUMMY(vmsplice);
/* Linux 2.6.18: */
Index: head/sys/arm64/linux/syscalls.master
===================================================================
--- head/sys/arm64/linux/syscalls.master
+++ head/sys/arm64/linux/syscalls.master
@@ -467,7 +467,14 @@
int linux_vmsplice(void);
}
76 AUE_NULL STD {
- int linux_splice(void);
+ int linux_splice(
+ int fd_in,
+ l_loff_t *off_in,
+ int fd_out,
+ l_loff_t *off_out,
+ l_size_t len,
+ l_uint flags
+ );
}
77 AUE_NULL STD {
int linux_tee(void);
Index: head/sys/compat/linux/linux_file.c
===================================================================
--- head/sys/compat/linux/linux_file.c
+++ head/sys/compat/linux/linux_file.c
@@ -1766,3 +1766,17 @@
return (kern_shm_open2(td, SHM_ANON, oflags, 0, shmflags, NULL,
memfd_name));
}
+
+int
+linux_splice(struct thread *td, struct linux_splice_args *args)
+{
+
+ linux_msg(td, "syscall splice not really implemented");
+
+ /*
+ * splice(2) is documented to return EINVAL in various circumstances;
+ * returning it instead of ENOSYS should hint the caller to use fallback
+ * instead.
+ */
+ return (EINVAL);
+}
Index: head/sys/i386/linux/linux_dummy.c
===================================================================
--- head/sys/i386/linux/linux_dummy.c
+++ head/sys/i386/linux/linux_dummy.c
@@ -98,7 +98,6 @@
DUMMY(migrate_pages);
DUMMY(unshare);
/* Linux 2.6.17: */
-DUMMY(splice);
DUMMY(tee);
DUMMY(vmsplice);
/* Linux 2.6.18: */
Index: head/sys/i386/linux/syscalls.master
===================================================================
--- head/sys/i386/linux/syscalls.master
+++ head/sys/i386/linux/syscalls.master
@@ -1753,7 +1753,14 @@
);
}
313 AUE_NULL STD {
- int linux_splice(void);
+ int linux_splice(
+ int fd_in,
+ l_loff_t *off_in,
+ int fd_out,
+ l_loff_t *off_out,
+ l_size_t len,
+ l_uint flags
+ );
}
314 AUE_NULL STD {
int linux_sync_file_range(

File Metadata

Mime Type
text/plain
Expires
Sun, Oct 19, 5:04 AM (1 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23875488
Default Alt Text
D25636.id.diff (3 KB)

Event Timeline