From owner-dev-commits-src-main@freebsd.org Fri Jan 1 00:11:53 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C82A04D5DDB; Fri, 1 Jan 2021 00:11:53 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D6QS93vvwz4bkK; Fri, 1 Jan 2021 00:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 70F46198B4; Fri, 1 Jan 2021 00:11:53 +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 1010BrwV005892; Fri, 1 Jan 2021 00:11:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1010Brs9005891; Fri, 1 Jan 2021 00:11:53 GMT (envelope-from git) Date: Fri, 1 Jan 2021 00:11:53 GMT Message-Id: <202101010011.1010Brs9005891@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: bb3a12f0e553 - main - fd: inline pwd_get_smr 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: bb3a12f0e55382b668066d8f8816f8073f5533d3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Jan 2021 00:11:54 -0000 The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=bb3a12f0e55382b668066d8f8816f8073f5533d3 commit bb3a12f0e55382b668066d8f8816f8073f5533d3 Author: Mateusz Guzik AuthorDate: 2020-12-28 09:29:57 +0000 Commit: Mateusz Guzik CommitDate: 2021-01-01 00:10:42 +0000 fd: inline pwd_get_smr Tested by: pho --- sys/kern/kern_descrip.c | 10 ---------- sys/sys/filedesc.h | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index a510ad90a618..ff11ae4f1a61 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -3672,16 +3672,6 @@ pwd_hold(struct thread *td) return (pwd); } -struct pwd * -pwd_get_smr(void) -{ - struct pwd *pwd; - - pwd = vfs_smr_entered_load(&curproc->p_pd->pd_pwd); - MPASS(pwd != NULL); - return (pwd); -} - static struct pwd * pwd_alloc(void) { diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h index 53d289366580..ae2232814136 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -329,7 +329,7 @@ pwd_set(struct pwddesc *pdp, struct pwd *newpwd) smr_serialized_store(&pdp->pd_pwd, newpwd, (PWDDESC_ASSERT_XLOCKED(pdp), true)); } -struct pwd *pwd_get_smr(void); +#define pwd_get_smr() vfs_smr_entered_load(&curproc->p_pd->pd_pwd) #endif /* _KERNEL */