From nobody Sat Apr 16 02:18:38 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A1EDB5D7ADA; Sat, 16 Apr 2022 02:18:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KgH1V4BxNz4lyN; Sat, 16 Apr 2022 02:18:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650075518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bS7eW9QuxCFKzKCS6EcMHYX5SeIleG1kjwFGqg6QFQI=; b=PQKJ46nKXgXvHHdkcGTbJcG+ax7XxtdjZ4LGkkwveB5lLj5RaSPrmnCDjmUTSv4DT4XXmy rGeqy2W3YQ2kbHLbj1p7pnACBzX6U72DrRqDBrbAAgaHM37VP0q5A08uSxvi5xli3fYKbw m+rB9oUWwNYY7YzgrylGsj3tJP5Sf+q1zgug9GaCZLssp6LkMHWs5XGOeUVmSFQNVb08pn 9Ph0v1rMrrmhja8wcZQzoAtEL1aGDVCk7EoTH4f5P73l7TyWkRELRJw+NQ2Z+iXR9O06s0 iOoksVeqgHhhlyZr/6TAE3BDg0LOQIY91CO2mFBMWPe5CQTFD+TFk15I4RO64w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7035C20AD7; Sat, 16 Apr 2022 02:18:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23G2IcZL025301; Sat, 16 Apr 2022 02:18:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23G2Icbe025300; Sat, 16 Apr 2022 02:18:38 GMT (envelope-from git) Date: Sat, 16 Apr 2022 02:18:38 GMT Message-Id: <202204160218.23G2Icbe025300@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6ccd5caea9b8 - stable/13 - Style. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6ccd5caea9b86234b733e64b371796acc3026649 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650075518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bS7eW9QuxCFKzKCS6EcMHYX5SeIleG1kjwFGqg6QFQI=; b=qjfTKH5eeLvGfwIkckkH6gksPEA4PPdQkhofI1IEZ0EBvH59WYo44xUpJpxD6qCAV6rmFs sc1s/AsOwa6qWfFhz/K57F3goN/o/CMUUMG8PG9ip1XP/Sl8846RGnycuVFmWcyMD6xDR9 5HhEdsQPmkArkSlFMdlpUZvjcv73uxkDDBD+b4smgKRd4puI6iR7ImdKer3u4nEkf7vb7l Fk/rm7OcQH5bbV9XpuufpElQ6a8tYNk25cT4qbrFovgNMONBUZneOWnOhHUzzwjwRSy+1J L7rWuhzGvyL4o5ZSlnNLmwVISr9i4DbpQujVk0YzEadCPI/UPouGi/wk6fB7EA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650075518; a=rsa-sha256; cv=none; b=y3wEj3kxaBOqGyndhPr7KVyfLgQ1WFikis5vHFcSXGZ8Mv/LPV9xENUrAmSQx/EevI9Wlw 1iKZ+eL5kr4wvnrFJzUPRuftxp/xwP/cAyHUB63Yy3QXCIcFM1AEJbVDPM5pbFZt+IXpxg cGad58uqIABecc8tsAYA/HUj6IaW6ToqSHoHIOkSdrjseKoXRGXhkmuqHHM5L8zkiFxO06 yHhmOVVzacNBuLoL6G6Zry+82P9XNPLG8+/+GDNjtF2koLtqfrMwcDQmLIO2qLAdXMM/xx DW14O4grP1r53UjS1IB4/pAlE3MzSKb/b38aIOEbE2MzJWh7hZrARBYMZHgrOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6ccd5caea9b86234b733e64b371796acc3026649 commit 6ccd5caea9b86234b733e64b371796acc3026649 Author: Konstantin Belousov AuthorDate: 2022-04-01 20:28:32 +0000 Commit: Konstantin Belousov CommitDate: 2022-04-16 02:18:18 +0000 Style. (cherry picked from commit 8cc19b1e47d06defe6d62da691a7a8f36727ec1a) --- sys/ufs/ufs/acl.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/ufs/ufs/acl.h b/sys/ufs/ufs/acl.h index 882823d46bac..07075db91745 100644 --- a/sys/ufs/ufs/acl.h +++ b/sys/ufs/ufs/acl.h @@ -39,8 +39,10 @@ #ifdef _KERNEL -int ufs_getacl_nfs4_internal(struct vnode *vp, struct acl *aclp, struct thread *td); -int ufs_setacl_nfs4_internal(struct vnode *vp, struct acl *aclp, struct thread *td); +int ufs_getacl_nfs4_internal(struct vnode *vp, struct acl *aclp, + struct thread *td); +int ufs_setacl_nfs4_internal(struct vnode *vp, struct acl *aclp, + struct thread *td); void ufs_sync_acl_from_inode(struct inode *ip, struct acl *acl); void ufs_sync_inode_from_acl(struct acl *acl, struct inode *ip);