From nobody Fri Feb 11 13:58:02 2022 X-Original-To: dev-commits-src-all@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 5920619B0546; Fri, 11 Feb 2022 13:58:03 +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 4JwFZ30BRNz3sgr; Fri, 11 Feb 2022 13:58:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644587883; 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=kKUvdB5SD4Sp3W1ovQj/tVJl6Q3lnkqBaPvcPWJHi68=; b=rkczOQA5s+US7ciPs0lf/e0eI7TOp4CedL8xlR+vodQZgRx5vjUlgKnAOZylmivNz7rAwH 0UXMb6ijML1HNoqryfeWSYEmPrg5swPib6Yjco5ZpSVsIHuenx7RF87sbqP3uGQnZUT1+k jpTOVovy0IOpHHHuNR3DHA/96bxN19WwADibO8+xPSaLfZDVMItM4AWFwXE3O8M2/pUQEK 0YgNl78/OfbLBYF3v4atk9LfnT4OEh1ziAsyPNN/RE4S6qZ2VYl4TilNswSMet74gUta+o qv3EIxLnWlomLSssrTUEybe5Yxd+jJ5xjeyE2OyiAr7w6eneOHtgMFtOviLFuw== 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 AEDE4154C6; Fri, 11 Feb 2022 13:58:02 +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 21BDw2pG093107; Fri, 11 Feb 2022 13:58:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21BDw2UA093106; Fri, 11 Feb 2022 13:58:02 GMT (envelope-from git) Date: Fri, 11 Feb 2022 13:58:02 GMT Message-Id: <202202111358.21BDw2UA093106@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: b937908e41d7 - main - fd: split fget_cap depending on CAPABILITIES List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b937908e41d7d1b33e062edc02f04980a2b8732e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644587883; 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=kKUvdB5SD4Sp3W1ovQj/tVJl6Q3lnkqBaPvcPWJHi68=; b=BxgMCxzRmOboaDTML7vUDpxzMVFliL58/aOcuaxEb09nWcmPdhoehJMPS7OLXn7RQVGGXC IpEd1KHv+1fcS8tLyVjulPe8YrVRQ/hGDvaxZXPQklT1RLQMYXWNMVNcV1ZAXlDH93o2FZ KA7HyNE7fwJV2mV5ar4LUpxdQkV34+QWK8vt0zfAmfC0JB2WX67hB9F2lEQ7r35RkOZZc3 KVjIB4X+XbuJKkOXM8LyCALsi0flus6IdflM1KoPjYatdetzAS5/Nhk1YnhWB/CpBVuC9T qJML6gffwRL7x9tR66jHcEW6gtVPB0q8uqITVq54FoJJYaeGSt16+4ZNsrk2UA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644587883; a=rsa-sha256; cv=none; b=QBjlfkNHQYxwABSruikzKwtiE7K592AaWa7MIcO6A6XEQf9mxiPYm0tJSCBxxEwL5lC5DL CdXzRghEsJreWweiPI16x3mZ1MGka+6f8zSLC688duBL0lzOsc3CDc0CjFEXLTXKnz8AQX oZw6MJ5yGF0TfPcGKxUuGtZPDqX8K+lLOrmucnh4Y0JfbzpKIQoIlS7axa4T6tDyvroH1g 6+KwWl5BNTfXIhctiWV2mLJkAOLYNuPCvOpn7ONO2Qf1ZGsy7ys6Sn/fCwH35hDMC16h/c 80ao9Nq7XsVIOlpy4aXpuvJK+PDBx8XkW5JhzCTlU9g8uesJ8m7EC0xt22eXzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=b937908e41d7d1b33e062edc02f04980a2b8732e commit b937908e41d7d1b33e062edc02f04980a2b8732e Author: Mateusz Guzik AuthorDate: 2022-02-11 11:45:57 +0000 Commit: Mateusz Guzik CommitDate: 2022-02-11 12:13:27 +0000 fd: split fget_cap depending on CAPABILITIES This will simplify an upcoming change. --- sys/kern/kern_descrip.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index c4cf9abde664..84622e163503 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -2868,17 +2868,13 @@ out: return (error); } +#ifdef CAPABILITIES int fget_cap(struct thread *td, int fd, cap_rights_t *needrightsp, struct file **fpp, struct filecaps *havecapsp) { struct filedesc *fdp = td->td_proc->p_fd; int error; -#ifndef CAPABILITIES - error = fget_unlocked(fdp, fd, needrightsp, fpp); - if (havecapsp != NULL && error == 0) - filecaps_fill(havecapsp); -#else struct file *fp; seqc_t seq; @@ -2910,9 +2906,23 @@ get_locked: if (error == 0 && !fhold(*fpp)) error = EBADF; FILEDESC_SUNLOCK(fdp); -#endif return (error); } +#else +int +fget_cap(struct thread *td, int fd, cap_rights_t *needrightsp, + struct file **fpp, struct filecaps *havecapsp) +{ + struct filedesc *fdp = td->td_proc->p_fd; + int error; + + error = fget_unlocked(fdp, fd, needrightsp, fpp); + if (havecapsp != NULL && error == 0) + filecaps_fill(havecapsp); + + return (error); +} +#endif #ifdef CAPABILITIES int