From nobody Tue Oct 24 00:47:50 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 4SDth675KPz4xD8q; Tue, 24 Oct 2023 00:47:50 +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 4SDth63X1Nz4PqB; Tue, 24 Oct 2023 00:47:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698108470; 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=do6kJycXy0u6uNVAy8go+HXagkQF6XxxBtiGhjGn4NM=; b=QmDioMIhW8EOJNOJJk5WYGgtEt3AhPZlyWw0Ui05TrQFTTGHIEnEq6oOzYKjCoMZkovAjA n+4d/7twJ61jOrAANRt+nmZM402mxMUHAVmmMxT2mHo2vw63hgJqxWtCUDRKYA4OF7PinB J8x36kWWpnUI8Y4riejEgjw0prv/9kXCsI4zZA0rhrHJSTtxeyBTwEBzKGggBUoCnLXIlK ssrMqqLGdNrnAHtHb0hmH7FWVfnX8JIgZ7DbsQsR27+1Y5wW+v8VR1hf3KcSa2gOxy6ubo cB7LqeUDMBl+/cl/HsNiZ/XpA925A06HwMEYSHQ/PUbCDu/D+4OFOZTlL13ZAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698108470; a=rsa-sha256; cv=none; b=CNcUmi3Hw8I69RGgZxuGbKcIfukbce4X0tuGvWGQqx4KHAouEKcdj2RTPKPImIXMnPBKv5 WKWAkPoKG+xmkS3hC8Ui3RKDt6bkW+ThulGZ21bqb1idqqGeyoyhRWQ7Kfykm/CdkGE+o3 sMDV6e5SPUtcjBTkCXDEUmj3rNiuFVJ3UK+Q9obk0NYuDJRLeZOmteUp1ijINqy/T2z9/z p+/yFNj8hq/DCflKKvJQKBxV+dYIm1lGVrbZF+m26+QHPtzJYDXqHFayddRPnu8Z9Fulbb nRejnzfwqeWs9q8IrV9KZmqj2mBWUrUJelDe6y2YJWFkr7jZ+hFhw7i2l4/5Hg== 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=1698108470; 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=do6kJycXy0u6uNVAy8go+HXagkQF6XxxBtiGhjGn4NM=; b=qyij+qLuwvTPcjYU5KAMpufE7JmxWc+bA/aCtZzW0VVSrhbfihDMu8p66dhkJV3NQLgyKA e/KoJ0c4T4CzAxqiIZTkhUIK/jKC4vP1oc7lfH6GYk/1BjLEHUV7jIefREx1KCWj+T8xNF U1XGv2Yeq1DCGj4qDHfV1M1QaHtjfv3xboI5FWwNc6adWtIrk7HeziQeijQH48vOQhjqO6 6XB8hOjzH2VvZaD6sYxgZKZRbBPT8xQ0D1K4LJERYdknaleYhipC6OZmKmPZk8fntpNiJW bl6uPJyFw/B120xHZslrUEsEi9gdKJK14HOHWbReMMg8gmkyslHoZEjqrYi1YQ== 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 4SDth62RtZz12Hy; Tue, 24 Oct 2023 00:47:50 +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 39O0lotE005126; Tue, 24 Oct 2023 00:47:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O0loNI005123; Tue, 24 Oct 2023 00:47:50 GMT (envelope-from git) Date: Tue, 24 Oct 2023 00:47:50 GMT Message-Id: <202310240047.39O0loNI005123@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: 2746fc0a5c89 - stable/13 - automount(8): when flushing autofs, specify fsid 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: 2746fc0a5c8956deb2a13822c640fbee0fba5b95 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2746fc0a5c8956deb2a13822c640fbee0fba5b95 commit 2746fc0a5c8956deb2a13822c640fbee0fba5b95 Author: Konstantin Belousov AuthorDate: 2023-09-29 18:43:42 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-24 00:47:20 +0000 automount(8): when flushing autofs, specify fsid PR: 272446 (cherry picked from commit 56c44bd92efa002b2185445878fc98172ae8c66f) --- usr.sbin/autofs/automount.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/autofs/automount.c b/usr.sbin/autofs/automount.c index cee647cb4e2c..6637e16c9129 100644 --- a/usr.sbin/autofs/automount.c +++ b/usr.sbin/autofs/automount.c @@ -229,7 +229,7 @@ mount_unmount(struct node *root) } static void -flush_autofs(const char *fspath) +flush_autofs(const char *fspath, const fsid_t *fsid) { struct iovec *iov = NULL; char errmsg[255]; @@ -242,6 +242,8 @@ flush_autofs(const char *fspath) __DECONST(void *, "autofs"), (size_t)-1); build_iovec(&iov, &iovlen, "fspath", __DECONST(void *, fspath), (size_t)-1); + build_iovec(&iov, &iovlen, "fsid", + __DECONST(void *, fsid), sizeof(*fsid)); build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg)); @@ -291,7 +293,7 @@ flush_caches(void) continue; } - flush_autofs(mntbuf[i].f_mntonname); + flush_autofs(mntbuf[i].f_mntonname, &statbuf.f_fsid); } }