From nobody Mon Sep 11 18:50:26 2023 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 4Rkwl646Pdz4tL9J; Mon, 11 Sep 2023 18:50:26 +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 4Rkwl63RmVz3RYk; Mon, 11 Sep 2023 18:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694458226; 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=VWSz6E1vnDov1cnldXg1LXUWshxVI9EByEYLy66zE18=; b=HblH8mBH9AHjeV+7yFq3/0YWZ+EfOBR+OmQ5qK4sPpiSWSo4bnArYPU6nYLtdkxKJZfOLG H0Snw55F+Iard+OXteMo6tV33iUaUEJpf3sb7d8lwX4ysWFO4z+D8ynWRkb4z264SwL3IH fOT+Kos/M1Q9JMz4OjbOU6iu135h32kyvV0nkTJtg9gSsoTGISC88JW2tKzvEdi++WSKAZ Um+Q5j+2oRBkk2pfUlGXbLfXap9pWqRMtGmUZfB57KN1UwYCPgSDbIPDg1sWAmvWxrziko XHqcogSenLgdjJRQ3IpaXPHMlXG0crqgaFn+gY5Zc80bzKgavEMBIp3vGIMh0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694458226; a=rsa-sha256; cv=none; b=rXeWMeOJh24+hLIbf5Pbuq7aIiW34kWsQnQBV2ufLWfG4hQJEVxufCr4NexXzG+h3Inpo9 uR310iGeCwdEgN7eYD8FlsTRZLoVQDE6Unr/UokwYmJKpWsDUAsEFKhR8Y1EMjbvlRfIG1 5cD34AKYIESAGN9ik/RlWnm8cIo7zU93TSxVWQ4taPKJyPrDz1/ol8lcKTU70qJtnhLEFo XfWuFDwhwRkiPteNHBa5dbnABrsCTQ3JfurmVYosVlqc8ZEQqSliW/Ac6SBmRaUZi31fAF 2kd9/qrPtR2fZ2N4/TbK+bsCYJgFZO4C0taQ3NvOGnvhBHwJ2O35FIKnYWXaVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694458226; 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=VWSz6E1vnDov1cnldXg1LXUWshxVI9EByEYLy66zE18=; b=tJzcRQjcnidk5Jh2Z+c9V5N8xECMwVZcEm/2sY4Z2CzWS/f0u9bdVOWdQ9GwNpVY4Yi18z wp7VQ/9sxbTIs49w9iXSZxsDqT6P8qfVaQstNGBVT7aDHksh2JDfIH1dXF1N6qXuenT/00 1X2so5BnBjYVDKdppwLr4Qtemp8R7Yan8cTaTwVb/Bf5pR04tAxoseD6vxume/2waOp7ui 7QCg9KfNBE+QVsnWuHI6UTZy9Qg6yBNeoNTl7iQ/jlMWY182pTXkzUpuQ+PfD7niS3xTfZ fUANnpBk94OJwX2uyud5dUOWuIvim0ysNozS/oCA9eXd5HdHQqpC7ZuZGPW2Dg== 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 4Rkwl62YzLz11C6; Mon, 11 Sep 2023 18:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38BIoQhq083159; Mon, 11 Sep 2023 18:50:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BIoQ1A083156; Mon, 11 Sep 2023 18:50:26 GMT (envelope-from git) Date: Mon, 11 Sep 2023 18:50:26 GMT Message-Id: <202309111850.38BIoQ1A083156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 0754c27f4926 - stable/12 - msdosfs deextend(): memoize DETOV(dep) 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 0754c27f49262e395d5814947a334dbd5b077504 Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0754c27f49262e395d5814947a334dbd5b077504 commit 0754c27f49262e395d5814947a334dbd5b077504 Author: Konstantin Belousov AuthorDate: 2023-02-11 18:05:14 +0000 Commit: Ed Maste CommitDate: 2023-09-11 18:04:52 +0000 msdosfs deextend(): memoize DETOV(dep) (cherry picked from commit 67dc1e7b0457ec014a1291c5874decdefe7bffdd) (cherry picked from commit 03562adbefb80ba94bebe602fc051bbc4292cb37) --- sys/fs/msdosfs/msdosfs_denode.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index beb615ec7a34..b251c2797467 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -475,13 +475,14 @@ int deextend(struct denode *dep, u_long length, struct ucred *cred) { struct msdosfsmount *pmp = dep->de_pmp; + struct vnode *vp = DETOV(dep); u_long count; int error; /* * The root of a DOS filesystem cannot be extended. */ - if ((DETOV(dep)->v_vflag & VV_ROOT) && !FAT32(pmp)) + if ((vp->v_vflag & VV_ROOT) != 0 && !FAT32(pmp)) return (EINVAL); /* @@ -507,10 +508,10 @@ deextend(struct denode *dep, u_long length, struct ucred *cred) return (error); } } - vnode_pager_setsize(DETOV(dep), length); + vnode_pager_setsize(vp, length); dep->de_FileSize = length; dep->de_flag |= DE_UPDATE | DE_MODIFIED; - return (deupdat(dep, !DOINGASYNC(DETOV(dep)))); + return (deupdat(dep, !DOINGASYNC(vp))); } /*