From nobody Sat Dec 31 01:03:13 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 4NkP4x5Fn4z2kxhZ; Sat, 31 Dec 2022 01:03:13 +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 4NkP4x4l5cz452p; Sat, 31 Dec 2022 01:03:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672448593; 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=1MnDQt7ekdbTAm02zgssmJhsvzVb55zfFt98y2cnVjc=; b=AFYWFLSBF0MEKvlx/9rXnNG2eBcJaME7V7CMCGZ0Rr/4ROXczQNd/TSWi6Rz0dllh3cYvD JamSjMGj83r1REnWZrSA2dAZgunkF2awqrza5nU2Dp6hhXKCLUv7TQGcprT6acnpcRCov+ Presl6HRVBNvVMr7pt/RjCn7daCod9dhqnshSTeZnZMAWo1Yta9f4SoPPMSvU0OJCktikl vCJFf+RiAuNsixum7x1pXGiDQDMRSNLeuITtUuaBTKOIGM4ahceDqMiolwPidHxOaTPctv RknNddImZElWOmEYyhr8PMt8dmwy1PwnKcpfdQ7oJ2d+mlCXUnMuLJNRcQWROg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672448593; 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=1MnDQt7ekdbTAm02zgssmJhsvzVb55zfFt98y2cnVjc=; b=ZFN08NkdiO7/92t0DYpn6IR0sQUT5CV9cApKX/NCEYxupySFqY7fds4zfMVCGytIpF7pxD PQimx2XtYkv3a2Dl2+Z5/lGeniDi0a+zE/4blUVuoDDMNu5uDY8+Ju6RQdYfr5qOGtWRzJ n2TymZil1KG/2FNhb2oRACaAapE+a6YqU5dzMUR25xk9kYi8xiO9E5S6FFGZtYVsB7nqVk 57qDVX+etNvLVWYATvRCb81VQF5UA4+udGq+JRFtgw6qzVyhPhzWyRKsWPJ8dKYnbK06oT mmpY0LIotkLOEmeleUz74gEq5/KBWWCL1B++F9hvRRmrgxXsoQKCMjqdnJB9Zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672448593; a=rsa-sha256; cv=none; b=ZCsZteIzztk2i9EnJHam2CD9oyfqhcnErGLxtBejp2MFqi3U8fBGdiQgEFWWY+W+68XGTn +Az9PoUThAOO46PEOqIunVGnwOrRF1hL2Fg8CDUB2IBSosk44U4eOCfxKk8YmWgFK88M9r 6DHcdvTXprlvuS754C4AoRC5Qw3MDAKCWT981kSrj411pdARtSlsEZY2xrVm/JQofQzVmR 2YTHRqs8GIihhrRvsCGbkozbvzSsIBbSubUozo5HHhtE0zpJWByWCIAZoVKH2k/vha2I07 Yma2BC2CTHHFPHuCNpAvAxL6iXie2PzOvNM95Kq87w3T+Ix0nTPZvfhlrFLXow== 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 4NkP4x3rXczVSQ; Sat, 31 Dec 2022 01:03:13 +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 2BV13Djc089693; Sat, 31 Dec 2022 01:03:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BV13DoY089692; Sat, 31 Dec 2022 01:03:13 GMT (envelope-from git) Date: Sat, 31 Dec 2022 01:03:13 GMT Message-Id: <202212310103.2BV13DoY089692@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: 2c88fb783f75 - stable/13 - tmpfs: update changed/modified timestamps for truncates that do not change size 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2c88fb783f754982d1ef964e6c73386d152e9d03 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2c88fb783f754982d1ef964e6c73386d152e9d03 commit 2c88fb783f754982d1ef964e6c73386d152e9d03 Author: Konstantin Belousov AuthorDate: 2022-12-24 00:11:05 +0000 Commit: Konstantin Belousov CommitDate: 2022-12-31 01:02:42 +0000 tmpfs: update changed/modified timestamps for truncates that do not change size PR: 268528 (cherry picked from commit 860399eb86cc431412bfbce0ab76c6652e5b6c07) --- sys/fs/tmpfs/tmpfs_subr.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c index c278261c9453..f0ed8ee404fa 100644 --- a/sys/fs/tmpfs/tmpfs_subr.c +++ b/sys/fs/tmpfs/tmpfs_subr.c @@ -2161,29 +2161,19 @@ tmpfs_itimes(struct vnode *vp, const struct timespec *acc, int tmpfs_truncate(struct vnode *vp, off_t length) { - int error; struct tmpfs_node *node; + int error; - node = VP_TO_TMPFS_NODE(vp); - - if (length < 0) { - error = EINVAL; - goto out; - } - - if (node->tn_size == length) { - error = 0; - goto out; - } - + if (length < 0) + return (EINVAL); if (length > VFS_TO_TMPFS(vp->v_mount)->tm_maxfilesize) return (EFBIG); - error = tmpfs_reg_resize(vp, length, FALSE); + node = VP_TO_TMPFS_NODE(vp); + error = node->tn_size == length ? 0 : tmpfs_reg_resize(vp, length, + FALSE); if (error == 0) node->tn_status |= TMPFS_NODE_CHANGED | TMPFS_NODE_MODIFIED; - -out: tmpfs_update(vp); return (error);