From owner-dev-commits-src-main@freebsd.org Fri Mar 12 15:47:55 2021
Return-Path: <owner-dev-commits-src-main@freebsd.org>
Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id A6A5157CD2C;
Fri, 12 Mar 2021 15:47:55 +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 4Dxqvv4HVDz4SSM;
Fri, 12 Mar 2021 15:47:55 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 81D051A4AF;
Fri, 12 Mar 2021 15:47:55 +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 12CFltwi007719;
Fri, 12 Mar 2021 15:47:55 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12CFltjp007718;
Fri, 12 Mar 2021 15:47:55 GMT (envelope-from git)
Date: Fri, 12 Mar 2021 15:47:55 GMT
Message-Id: <202103121547.12CFltjp007718@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Robert Wing <rew@FreeBSD.org>
Subject: git: 88e531f38c24 - main - autofs: best effort to maintain mounttab
and mountdtab
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: rew
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 88e531f38c2412bf030f4e8dd563efc45b70797e
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-main@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for the main branch of the src repository
<dev-commits-src-main.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-main/>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Help: <mailto:dev-commits-src-main-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Mar 2021 15:47:55 -0000
The branch main has been updated by rew:
URL: https://cgit.FreeBSD.org/src/commit/?id=88e531f38c2412bf030f4e8dd563efc45b70797e
commit 88e531f38c2412bf030f4e8dd563efc45b70797e
Author: Robert Wing <rew@FreeBSD.org>
AuthorDate: 2021-02-17 07:51:38 +0000
Commit: Robert Wing <rew@FreeBSD.org>
CommitDate: 2021-03-12 15:41:55 +0000
autofs: best effort to maintain mounttab and mountdtab
When an automounted filesystem is successfully unmounted, call
rpc.umntall(8) with the -k flag.
rpc.umntall(8) is used to clean up /var/db/mounttab on the client and
/var/db/mountdtab on the server. This is only useful for NFSv3.
PR: 251906
Reviewed by: trasz
Differential Revision: https://reviews.freebsd.org/D27801
---
usr.sbin/autofs/automount.c | 2 ++
usr.sbin/autofs/autounmountd.c | 3 ++-
usr.sbin/autofs/common.c | 13 +++++++++++++
usr.sbin/autofs/common.h | 1 +
4 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/usr.sbin/autofs/automount.c b/usr.sbin/autofs/automount.c
index e28129eee5b8..cd29c910bce2 100644
--- a/usr.sbin/autofs/automount.c
+++ b/usr.sbin/autofs/automount.c
@@ -80,6 +80,8 @@ unmount_by_statfs(const struct statfs *sb, bool force)
free(fsid_str);
if (error != 0)
log_warn("cannot unmount %s", sb->f_mntonname);
+ else
+ rpc_umntall();
return (error);
}
diff --git a/usr.sbin/autofs/autounmountd.c b/usr.sbin/autofs/autounmountd.c
index 7a4f04c0b848..57375f04d743 100644
--- a/usr.sbin/autofs/autounmountd.c
+++ b/usr.sbin/autofs/autounmountd.c
@@ -170,7 +170,8 @@ unmount_by_fsid(const fsid_t fsid, const char *mountpoint)
log_warn("cannot unmount %s (%s)",
mountpoint, fsid_str);
}
- }
+ } else
+ rpc_umntall();
free(fsid_str);
diff --git a/usr.sbin/autofs/common.c b/usr.sbin/autofs/common.c
index 7c8df4205a86..4581e5c4f2f9 100644
--- a/usr.sbin/autofs/common.c
+++ b/usr.sbin/autofs/common.c
@@ -1204,6 +1204,19 @@ lesser_daemon(void)
}
}
+/*
+ * Applicable to NFSv3 only, see rpc.umntall(8).
+ */
+void
+rpc_umntall(void)
+{
+ FILE *f;
+
+ f = auto_popen("rpc.umntall", "-k", NULL);
+ assert(f != NULL);
+ auto_pclose(f);
+}
+
int
main(int argc, char **argv)
{
diff --git a/usr.sbin/autofs/common.h b/usr.sbin/autofs/common.h
index 34257c1caeff..e68a0be5f7c8 100644
--- a/usr.sbin/autofs/common.h
+++ b/usr.sbin/autofs/common.h
@@ -96,6 +96,7 @@ char *defined_expand(const char *string);
void defined_init(void);
void defined_parse_and_add(char *def);
void lesser_daemon(void);
+void rpc_umntall(void);
int main_automount(int argc, char **argv);
int main_automountd(int argc, char **argv);