diff options
Diffstat (limited to 'usr/src/uts/common/syscall/sendfile.c')
| -rw-r--r-- | usr/src/uts/common/syscall/sendfile.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/usr/src/uts/common/syscall/sendfile.c b/usr/src/uts/common/syscall/sendfile.c index 7cfd5bc188..d0667061d3 100644 --- a/usr/src/uts/common/syscall/sendfile.c +++ b/usr/src/uts/common/syscall/sendfile.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2022 Garrett D'Amore */ #include <sys/types.h> @@ -68,8 +69,6 @@ extern int sosendfile64(file_t *, file_t *, const struct ksendfilevec64 *, ssize32_t *); -extern int nl7c_sendfilev(struct sonode *, u_offset_t *, struct sendfilevec *, - int, ssize_t *); extern int snf_segmap(file_t *, vnode_t *, u_offset_t, u_offset_t, ssize_t *, boolean_t); extern sotpi_info_t *sotpi_sototpi(struct sonode *); @@ -1319,16 +1318,9 @@ sendfilev(int opcode, int fildes, const struct sendfilevec *vec, int sfvcnt, * Future zero copy code will plugin into sendvec_chunk * only because doing zero copy for files smaller then * pagesize is useless. - * - * Note, if socket has NL7C enabled then call NL7C's - * senfilev() function to consume the sfv[]. */ if (is_sock) { - if (!SOCK_IS_NONSTR(so) && - _SOTOTPI(so)->sti_nl7c_flags != 0) { - error = nl7c_sendfilev(so, &fileoff, - sfv, copy_cnt, &count); - } else if ((total_size <= (4 * maxblk)) && + if ((total_size <= (4 * maxblk)) && error == 0) { error = sendvec_small_chunk(fp, &fileoff, sfv, copy_cnt, |