From nobody Tue May 20 09:50:53 2025 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 4b1qYn4ny3z5w7wg; Tue, 20 May 2025 09:50: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b1qYn3JG6z3DBt; Tue, 20 May 2025 09:50:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747734653; 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=FxLCIXJWbedEFzhC5ywdCLZIIsMfT4EuKsKCE+NhJVE=; b=Xk/V002gZmaR+rLpJORC/EKPfNwdr5/9j5OQNtyifwBgxHqPGF7raeesAdVPn8SHhAaVth vl4Uryom7eFAjP8RvwMRqaoz47LW1l6578kC0vAdQzRuRzaTwf9yUyyUmsgVF0E9GGA94d stMSwEUXiH0sjSxFvOHIzf2I02ac4Wm6DYY31jRVkDOfd9pZcr8/gyQJIoJmXQa70KaYoH 5XVS7Hav4bxX45H1MVnE8IdsEG6Xk1HcFSgrZW/WpqD5FuyLPQHfrnZSl2xIIjOnneQncV jvb6OB1pU5xvgPx+k4WwNaYbiXlcui0HBdnDj1KpVq8OU38oNDbaGjHe9HDZpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747734653; 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=FxLCIXJWbedEFzhC5ywdCLZIIsMfT4EuKsKCE+NhJVE=; b=mveER/b6HKPij/09Mfxnx7nusi06JHcS360X07X7t40rifmwF+rLHTPMbwbEp6xOxGOl4Z aTUz/XQLTqtiPGHX5H+soITEa6KyIdPu07YDoxDVTCnoxNLHiRCTMtcFio+Y/v/Fah2GUI gInbdhg6Y1fz2BH598oZ/MBS68A2ihw840QUpGGfo6griP5ao18RzMzJ9PC3gQViAYLbBW BRmKY87sqpzEJmz6T3oqStWae67eqWXgn7WGpYgqJoOtBEXoyUrS8h2CA9LypRotMav6yg JRygMJAr+KzSY/RPAybcMQP/iGpDSyNvw5iWYdmYtOeuAWwNgA5FbTywTMjYVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747734653; a=rsa-sha256; cv=none; b=C01MtJFa97bzyi9GOgTJydI24VJCPhCmx3MH+rgU8PT5+oyn01EBnL9ozB+eX/Iso/P8UJ 6IuTdZKxVyXnuA2LYwHtNs11MfiNpt+FweUlgLAE+3YWlUajQ1/ieA/JWv3TKIQJIrlsYI tCo78rd37/XomVI+CjfBhkbRnSBcGzRzZq5hiNt+jxGTB/SaSpLmvv8kw+LM04qpG030P9 9Ji9M8NP1cNAqnKyWIQ/oTXK2Fn4nY7oULzkcOSrqasXXzvj66yzf1zZqleiCfxBha28/2 lGWN4cDjpD/Kzdpl99+kJHja0Se6+PmZABMZnkCikPDeng9hsnZiWlSJ0QL9MQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4b1qYn2vnSzlXs; Tue, 20 May 2025 09:50:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54K9orqI085702; Tue, 20 May 2025 09:50:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54K9orwO085699; Tue, 20 May 2025 09:50:53 GMT (envelope-from git) Date: Tue, 20 May 2025 09:50:53 GMT Message-Id: <202505200950.54K9orwO085699@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 1e904d6742bb - main - makefs: Remove redundant 'stampst' checks in several backends 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e904d6742bbed99387cc6bcb00dc088192f65df Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=1e904d6742bbed99387cc6bcb00dc088192f65df commit 1e904d6742bbed99387cc6bcb00dc088192f65df Author: Bojan Novković AuthorDate: 2025-04-01 11:12:39 +0000 Commit: Bojan Novković CommitDate: 2025-05-20 09:50:27 +0000 makefs: Remove redundant 'stampst' checks in several backends PR: 285630 Sponsored by: Klara, Inc. Sponsored by: The FreeBSD Foundation Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D49601 --- usr.sbin/makefs/ffs.c | 6 ++++-- usr.sbin/makefs/msdos/msdosfs_vnops.c | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index 34a0f8a67497..4efcd20ad91a 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -679,8 +679,9 @@ ffs_build_dinode1(struct ufs1_dinode *dinp, dirbuf_t *dbufp, fsnode *cur, { size_t slen; void *membuf; - struct stat *st = stampst.st_ino != 0 ? &stampst : &cur->inode->st; + struct stat *st; + st = &cur->inode->st; memset(dinp, 0, sizeof(*dinp)); dinp->di_mode = cur->inode->st.st_mode; dinp->di_nlink = cur->inode->nlink; @@ -725,8 +726,9 @@ ffs_build_dinode2(struct ufs2_dinode *dinp, dirbuf_t *dbufp, fsnode *cur, { size_t slen; void *membuf; - struct stat *st = stampst.st_ino != 0 ? &stampst : &cur->inode->st; + struct stat *st; + st = &cur->inode->st; memset(dinp, 0, sizeof(*dinp)); dinp->di_mode = cur->inode->st.st_mode; dinp->di_nlink = cur->inode->nlink; diff --git a/usr.sbin/makefs/msdos/msdosfs_vnops.c b/usr.sbin/makefs/msdos/msdosfs_vnops.c index 441af0cae86a..b104f419a86a 100644 --- a/usr.sbin/makefs/msdos/msdosfs_vnops.c +++ b/usr.sbin/makefs/msdos/msdosfs_vnops.c @@ -94,8 +94,6 @@ static void unix2fattime(const struct timespec *tsp, uint16_t *ddp, static void msdosfs_times(struct denode *dep, const struct stat *st) { - if (stampst.st_ino) - st = &stampst; #if HAVE_STRUCT_STAT_BIRTHTIME unix2fattime(&st->st_birthtim, &dep->de_CDate, &dep->de_CTime);