From nobody Sat Oct 08 20:44:01 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 4MlHG96636z4f1kc; Sat, 8 Oct 2022 20:44:01 +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 4MlHG95Zc6z3Lkm; Sat, 8 Oct 2022 20:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665261841; 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=iuyUTkd+wFSX6fsLLAOfzBy3nunDHweVaBQ782+6g/o=; b=Iy/Kn7iHWBD8L5nG708SiiCNa2BPTDA/NV8DBrlTtgFs62p4OBEwf9ir3pIe5u6ja+AqBn QkY/1HVsm78+c8TmZcWPHeIbpyt5pjPTuBvs015/HxRj7c5s4Cy3jEs8c+vpDDcb/DyHmC zDpzTTsqHLFqguvKqeq64PW8mCzddIwlm7yVfeJDqoxlrrvmc3qKnp9YAlJk1Kwh84uJqi rJKgvuk07WCzVgLXDJmyXRYdHRe/uHonlw7Ptuu2hxOrSVGIHDd/ojly3eUZ1KIq7UWNBX RiBUa5Qa0gUM0Pp+880PciWTkAHeouOaSyaqT5yss7sQVppXvpUG4UnOlT5RaA== 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 4MlHG94ddqz13rx; Sat, 8 Oct 2022 20:44:01 +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 298Ki14i034797; Sat, 8 Oct 2022 20:44:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 298Ki13r034796; Sat, 8 Oct 2022 20:44:01 GMT (envelope-from git) Date: Sat, 8 Oct 2022 20:44:01 GMT Message-Id: <202210082044.298Ki13r034796@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: f860ce815177 - main - zfs: mix mismerge in zfs_znode_free 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f860ce8151776ae7fcf630f9212a239e6b44dbf9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665261841; 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=iuyUTkd+wFSX6fsLLAOfzBy3nunDHweVaBQ782+6g/o=; b=FUE/2EqDuh07DujPV3LckuqS22FwZA4tlv1xtDhekhRn6tNywYwx/4qIMx9FmSz68z14ZU 7xKCin2iyL8wqUXw5V7JTjwmfYOaH5JaG1H88XfRDsGCI8ARDAzQyKk8PwO2oUMHo/JlTS NMU0ePe2i6wIz6Vp8+wbnYndT3xiQBvcFFsg8b0ecSXkxvs39vkBAQEgRFJ81P/U/phOuw B6nv1Vp4Di6lkehP0y0mzrby2CvAo2YGFtHKQheL5Qm/01Hy4heW26oi4CHNKcL/tsV2i+ zi1eMeeqfbAJbQgXEnbbGT8nmjw76LulYASsERN387JlbDlf/U1SH9bxFGGIsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665261841; a=rsa-sha256; cv=none; b=OE/Z//6W3OyGW9HEAIeNT2pY4GebjYf460xyaY6qYal+JgrGFAtT5Xj+o1F9EK3g+Cj2bd bQmUL9SFakV58+/V+C0Qs9A3D6Y1em13weZohKmQYnenR0v3Hg/o5G7DsXR+oEY9lLFyQB 6ehyhuxKWrd1nI8Mmqvoc1C6DzBGePRqcqRXoJZxUzv2JgLcd5uLWvOxlNFUveVILzj/s8 4ks1EYTRLmYCkzYPWyryZ3O/zvRvNqP4/5Y4FZFnBdt7r9EUNmGWWnjt+OfS/TYZaHdgKW GsU2f3/58TSF7HoB1gXbGeNeQTQ6CN9mXGUuG/rmyjE3VAWWeiE606h430pUbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=f860ce8151776ae7fcf630f9212a239e6b44dbf9 commit f860ce8151776ae7fcf630f9212a239e6b44dbf9 Author: Mateusz Guzik AuthorDate: 2022-10-08 20:43:33 +0000 Commit: Mateusz Guzik CommitDate: 2022-10-08 20:43:33 +0000 zfs: mix mismerge in zfs_znode_free happens to be a noop --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c index a6b1668bc150..6345e9e69d30 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c @@ -1284,11 +1284,6 @@ zfs_znode_free(znode_t *zp) list_remove(&zfsvfs->z_all_znodes, zp); zfsvfs->z_nr_znodes--; mutex_exit(&zfsvfs->z_znodes_lock); - symlink = atomic_load_ptr(&zp->z_cached_symlink); - if (symlink != NULL) { - atomic_store_rel_ptr((uintptr_t *)&zp->z_cached_symlink, (uintptr_t)NULL); - cache_symlink_free(symlink, strlen(symlink) + 1); - } #if __FreeBSD_version >= 1300139 symlink = atomic_load_ptr(&zp->z_cached_symlink);