From nobody Tue Oct 24 00:46:33 2023 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 4SDtfd3YWyz4xDFG; Tue, 24 Oct 2023 00:46:33 +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 4SDtfd2mPbz4NJ4; Tue, 24 Oct 2023 00:46:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698108393; 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=WpfsW8PQlWCAwPtczMUwtYYc8PefcPqJSz7L/WRR83k=; b=pl2BnjUP7YvCMGU6vFeaDsAGPaX7Is8kA8r0Mxj/sUIp4fSZlXFbziw7DlDRjpr6X/6OeJ 4aXo4EsYLnW4YvVWZKVcni5F8d9/imxVDpdtVIa1uhYkUYsR3dEBxydj74cbnl8UPr08t8 eIXgQcDC2cKnSeRtozFyW/3yUUx2ShuXoQx7sRInxLD/HWeeSVy4A2TXKdoS086BSBW1ta YSj/9oYcdA4Hig9bH7WtpczRAD8kmT3c5gsbI3Nexlhfmnb5FBp7jh1APOu3UGCKlUy0ON iEBdQA2zSQgR2S/KB9bZa3pestJspbwFA6l5LSa5W2sNgd3UDLKKkMn6FitCEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698108393; a=rsa-sha256; cv=none; b=baeOer43soIwP18XtPvLJh2ejQQbXWs+EiBXEE6L8fgbHoYY9W7rFPWzD/wftU2cHMfw0H IS7FrKzzyMTb1Ier2M9O09uiEh60AWhw5PpalBdISxC+ulQ85ZMuZ2ja3UGnRr6xdGvhNY r5vrRNHsxBxrevPD4/s+70GQU1RklQqd3CPOfSigBHuUxKeWxZqlCCHNwg1slio8HQhsES FP/l3wnC4wRiOVYFMcGw5uOW7BfEGKo99fLgOucMddF1N67Ua07DcJerdhOnGdeo7HioYn wufkTVZrfRrVK6zxy4QBTqBjWCrSfuCl2eFHIxJYYHtnaitjyjrsd+hmc3zRKg== 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=1698108393; 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=WpfsW8PQlWCAwPtczMUwtYYc8PefcPqJSz7L/WRR83k=; b=rqu+5zIfZzx8RHAkF0XP16IYB+j0WL1O92zvItRJYmIdLbyb5Ecd1es7cHwTqKjpa1ODHb kYT+1O6JEv/Il5lIVKL7yfNnLrTVi1ikbLYoRsVXXDiJv+3ZD42kiiElBBzNQ8KTruiBEJ ZODLkYjqL7TD0uV0vc694a9HZpLGnyLvECsaFDor49/+RDosTaase0HleoEFXNkJrukiOK e5fSMd9QSlXI4LRGrMPdhDix9Uphp3FcuyYEoeakaYvO+BKIhYWaWL4684hTpjkxcaLbOh 5ygXREmWAhUCL5F+8WcsfTecFekAK5sBwfKonMka0AWT/KugBEIwPXiBX2zFjQ== 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 4SDtfd1gfcz12LC; Tue, 24 Oct 2023 00:46:33 +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 39O0kX7B004440; Tue, 24 Oct 2023 00:46:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O0kXa9004438; Tue, 24 Oct 2023 00:46:33 GMT (envelope-from git) Date: Tue, 24 Oct 2023 00:46:33 GMT Message-Id: <202310240046.39O0kXa9004438@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: c5f92e2ac8aa - stable/14 - automount(8): when flushing autofs, specify fsid 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/14 X-Git-Reftype: branch X-Git-Commit: c5f92e2ac8aad3c0d5e9659257f02846944bb347 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c5f92e2ac8aad3c0d5e9659257f02846944bb347 commit c5f92e2ac8aad3c0d5e9659257f02846944bb347 Author: Konstantin Belousov AuthorDate: 2023-09-29 18:43:42 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-24 00:46:02 +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); } }