diff options
| author | Gleb Smirnoff <glebius@FreeBSD.org> | 2020-05-03 00:12:56 +0000 |
|---|---|---|
| committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2020-05-03 00:12:56 +0000 |
| commit | 7b6c99d08d57bd6aeee333734b801208914fd788 (patch) | |
| tree | d170efb569044b2f93ad9efe75a46b771ff6f3a9 /sys/kern/kern_sendfile.c | |
| parent | bccf6e26e9ea8fe9f4cccc18c761f84c6c095045 (diff) | |
| download | src-7b6c99d08d57bd6aeee333734b801208914fd788.tar.gz src-7b6c99d08d57bd6aeee333734b801208914fd788.zip | |
Step 3: anonymize struct mbuf_ext_pgs and move all its fields into mbuf
within m_epg namespace.
All edits except the 'struct mbuf' declaration and mb_dupcl() were done
mechanically with sed:
s/->m_ext_pgs.nrdy/->m_epg_nrdy/g
s/->m_ext_pgs.hdr_len/->m_epg_hdrlen/g
s/->m_ext_pgs.trail_len/->m_epg_trllen/g
s/->m_ext_pgs.first_pg_off/->m_epg_1st_off/g
s/->m_ext_pgs.last_pg_len/->m_epg_last_len/g
s/->m_ext_pgs.flags/->m_epg_flags/g
s/->m_ext_pgs.record_type/->m_epg_record_type/g
s/->m_ext_pgs.enc_cnt/->m_epg_enc_cnt/g
s/->m_ext_pgs.tls/->m_epg_tls/g
s/->m_ext_pgs.so/->m_epg_so/g
s/->m_ext_pgs.seqno/->m_epg_seqno/g
s/->m_ext_pgs.stailq/->m_epg_stailq/g
Reviewed by: gallatin
Differential Revision: https://reviews.freebsd.org/D24598
Notes
Notes:
svn path=/head/; revision=360579
Diffstat (limited to 'sys/kern/kern_sendfile.c')
| -rw-r--r-- | sys/kern/kern_sendfile.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/kern/kern_sendfile.c b/sys/kern/kern_sendfile.c index 305cdd48304f..d6492d47f40b 100644 --- a/sys/kern/kern_sendfile.c +++ b/sys/kern/kern_sendfile.c @@ -198,8 +198,8 @@ sendfile_free_mext_pg(struct mbuf *m) cache_last = m->m_ext.ext_flags & EXT_FLAG_CACHE_LAST; flags = (m->m_ext.ext_flags & EXT_FLAG_NOCACHE) != 0 ? VPR_TRYFREE : 0; - for (i = 0; i < m->m_ext_pgs.npgs; i++) { - if (cache_last && i == m->m_ext_pgs.npgs - 1) + for (i = 0; i < m->m_epg_npgs; i++) { + if (cache_last && i == m->m_epg_npgs - 1) flags = 0; pg = PHYS_TO_VM_PAGE(m->m_epg_pa[i]); vm_page_release(pg, flags); @@ -365,7 +365,7 @@ sendfile_iodone(void *arg, vm_page_t *pa, int count, int error) #if defined(KERN_TLS) && defined(INVARIANTS) if ((sfio->m->m_flags & M_EXT) != 0 && sfio->m->m_ext.ext_type == EXT_PGS) - KASSERT(sfio->tls == sfio->m->m_ext_pgs.tls, + KASSERT(sfio->tls == sfio->m->m_epg_tls, ("TLS session mismatch")); else KASSERT(sfio->tls == NULL, @@ -1034,18 +1034,18 @@ retry_space: else m = m0; mtail = m0; - m0->m_ext_pgs.first_pg_off = + m0->m_epg_1st_off = vmoff(i, off) & PAGE_MASK; } if (nios) { mtail->m_flags |= M_NOTREADY; - m0->m_ext_pgs.nrdy++; + m0->m_epg_nrdy++; } m0->m_epg_pa[ext_pgs_idx] = VM_PAGE_TO_PHYS(pga); - m0->m_ext_pgs.npgs++; + m0->m_epg_npgs++; xfs = xfsize(i, npages, off, space); - m0->m_ext_pgs.last_pg_len = xfs; + m0->m_epg_last_len = xfs; MBUF_EXT_PGS_ASSERT_SANITY(m0); mtail->m_len += xfs; mtail->m_ext.ext_size += PAGE_SIZE; |