From nobody Sun Feb 19 05:47:17 2023 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 4PKF1f1Z2Gz3smTP; Sun, 19 Feb 2023 05:47:18 +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 4PKF1d4hQbz3L09; Sun, 19 Feb 2023 05:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676785637; 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=n77TQaqrcPqBeqOplenIosibLJsbA2GM3wIVEnb9oc8=; b=OTNSILHqo2lg4EA6n7cSz+O8nWOqU3gY4gOl/vNjJoliyVuyu/W8Bd1LZfYzBaTwK9WZqe SHQt7qbEZuO+LwzxawxVgcLqZulkE41gjCfed+210wyjwEFu/XWPkrlb2DB0avwGxLDnXp 3bJ9iH4LnmuEqcLczealykFvsqjxK1To0j4D8V/0G4XWCD2kQfWRClPouUnOkX8QQFuha9 KxthFE4vdNmwLwyeqDAk7MjRzsk+ZDnrVHmsIXzwruVrIK98v2wXT1L1jMEuLIRKCEpM4y 13oR8B6s+BDULSWmxM7waYJsZ+o5l82ziSIdXSK+cNthoeEsk1gXBKmB9vtviw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676785637; 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=n77TQaqrcPqBeqOplenIosibLJsbA2GM3wIVEnb9oc8=; b=HiKxAN2htqwtTgXv9lgF2Sb4JXwHoWKKgG5mZbshA8MvvMjUkQagSrra37xZVRyzFI5jsg UFxUtzjUReqKM7+eTeqYmnVa/5wo/kkIciYr7vti0DteeNb8xFsbs99yqGL10n933O17gF z/ZL4Zz6hLX2boDKINtKmHmZLC+7sJHNkHx8vKlKb2ibZ1In9+qzPSP56vCG/1HjES6U0o xNEcoSTwVl5pbrc9jXJCCN368Vfy99vXlu3oPU0BR3dXr3Ud66oUXBD2TdyzQf+HMev5hH 7OJBaGaCdweYgOclYdNl2Q2EKNAj8DRRidMiB/+tR/6WrmXSpiT7dOYxFr2JfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676785637; a=rsa-sha256; cv=none; b=hRbO872PaM+JtgzrM8VykBBcxBgJCibkWkU2W7X05aKl77B09f59rjzm1cZyqa6U34HHSM hDSFGug1nzNknGTL3rO4u1L0dVlm+TD3SvdtNMYoGRgK4A+95dOfl91ohrbiC9gXMWYtjC dpRKuaPVWQJNWxGZmEGQosoU6Mz7wFmkKrfia6hZ9AQHI/BcNKAQYpLMWvSvXYgqlqM06a vRI2C7tbkzIEhyVuvzRdrN0+IFboyh2uUcaDOsU5CiX95Cv95TVfnf5WcJAzphggEuVm7z 1llrS3iVdu/L4obNTIgoXWDtLjnIvO53sDWuNGqd+OH7WL94MrOQxvDDpcP/cQ== 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 4PKF1d22wWzrTd; Sun, 19 Feb 2023 05:47:17 +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 31J5lHOK097163; Sun, 19 Feb 2023 05:47:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31J5lHR6097162; Sun, 19 Feb 2023 05:47:17 GMT (envelope-from git) Date: Sun, 19 Feb 2023 05:47:17 GMT Message-Id: <202302190547.31J5lHR6097162@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: 03562adbefb8 - stable/13 - msdosfs deextend(): memoize DETOV(dep) 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: 03562adbefb80ba94bebe602fc051bbc4292cb37 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=03562adbefb80ba94bebe602fc051bbc4292cb37 commit 03562adbefb80ba94bebe602fc051bbc4292cb37 Author: Konstantin Belousov AuthorDate: 2023-02-11 18:05:14 +0000 Commit: Konstantin Belousov CommitDate: 2023-02-19 05:16:25 +0000 msdosfs deextend(): memoize DETOV(dep) (cherry picked from commit 67dc1e7b0457ec014a1291c5874decdefe7bffdd) --- 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 8511d873ea50..003c710801ee 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -494,13 +494,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); /* @@ -526,10 +527,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))); } /*