Date: Sat, 6 Jul 2019 16:19:04 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r349792 - stable/12/sys/vm Message-ID: <201907061619.x66GJ4D2036265@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Sat Jul 6 16:19:04 2019 New Revision: 349792 URL: https://svnweb.freebsd.org/changeset/base/349792 Log: MFC r349608: Use traditional 'p' local to designate td->td_proc in kern_mmap. Modified: stable/12/sys/vm/vm_mmap.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/vm/vm_mmap.c ============================================================================== --- stable/12/sys/vm/vm_mmap.c Sat Jul 6 15:55:16 2019 (r349791) +++ stable/12/sys/vm/vm_mmap.c Sat Jul 6 16:19:04 2019 (r349792) @@ -187,13 +187,15 @@ kern_mmap(struct thread *td, uintptr_t addr0, size_t s { struct vmspace *vms; struct file *fp; + struct proc *p; vm_offset_t addr; vm_size_t pageoff; vm_prot_t cap_maxprot; int align, error; cap_rights_t rights; - vms = td->td_proc->p_vmspace; + p = td->td_proc; + vms = p->p_vmspace; fp = NULL; AUDIT_ARG_FD(fd); addr = addr0; @@ -213,7 +215,7 @@ kern_mmap(struct thread *td, uintptr_t addr0, size_t s * pos. */ if (!SV_CURPROC_FLAG(SV_AOUT)) { - if ((size == 0 && curproc->p_osrel >= P_OSREL_MAP_ANON) || + if ((size == 0 && p->p_osrel >= P_OSREL_MAP_ANON) || ((flags & MAP_ANON) != 0 && (fd != -1 || pos != 0))) return (EINVAL); } else { @@ -356,7 +358,7 @@ kern_mmap(struct thread *td, uintptr_t addr0, size_t s if (error != 0) goto done; if ((flags & (MAP_SHARED | MAP_PRIVATE)) == 0 && - td->td_proc->p_osrel >= P_OSREL_MAP_FSTRICT) { + p->p_osrel >= P_OSREL_MAP_FSTRICT) { error = EINVAL; goto done; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907061619.x66GJ4D2036265>