The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0b06c284ae631fcca562e9ff13350b71362df6e5
commit 0b06c284ae631fcca562e9ff13350b71362df6e5 Author: Konstantin Belousov <[email protected]> AuthorDate: 2021-10-22 23:49:30 +0000 Commit: Konstantin Belousov <[email protected]> CommitDate: 2021-11-06 02:12:31 +0000 kern_exec.c: style (cherry picked from commit 143dba3a914294c2f4de80a46ffd04cd8b25246f) --- sys/kern/kern_exec.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 4a405637be4a..15af8f402b05 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -212,9 +212,9 @@ static const struct execsw **execsw; #ifndef _SYS_SYSPROTO_H_ struct execve_args { - char *fname; + char *fname; char **argv; - char **envv; + char **envv; }; #endif @@ -477,7 +477,8 @@ interpret: /* * Descriptors opened only with O_EXEC or O_RDONLY are allowed. */ - error = fgetvp_exec(td, args->fd, &cap_fexecve_rights, &newtextvp); + error = fgetvp_exec(td, args->fd, &cap_fexecve_rights, + &newtextvp); if (error) goto exec_fail; vn_lock(newtextvp, LK_SHARED | LK_RETRY); @@ -595,7 +596,8 @@ interpret: imgp->execpath = args->fname; else { VOP_UNLOCK(imgp->vp); - if (vn_fullpath(imgp->vp, &imgp->execpath, &imgp->freepath) != 0) + if (vn_fullpath(imgp->vp, &imgp->execpath, + &imgp->freepath) != 0) imgp->execpath = args->fname; vn_lock(imgp->vp, LK_SHARED | LK_RETRY); } @@ -1017,7 +1019,7 @@ exec_map_first_page(struct image_params *imgp) #endif error = vm_page_grab_valid_unlocked(&m, object, 0, VM_ALLOC_COUNT(VM_INITIAL_PAGEIN) | - VM_ALLOC_NORMAL | VM_ALLOC_NOBUSY | VM_ALLOC_WIRED); + VM_ALLOC_NORMAL | VM_ALLOC_NOBUSY | VM_ALLOC_WIRED); if (error != VM_PAGER_OK) return (EIO);
