From 77cb10967513d96e73c4959118a4b92dbc0bc6c2 Mon Sep 17 00:00:00 2001
From: Alan Somers <asomers@gmail.com>
Date: Wed, 16 Jun 2021 20:36:52 -0600
Subject: [PATCH] Missing changes from PR #1453

---
 src/mount/bsd.rs | 51 +++---------------------------------------------
 1 file changed, 3 insertions(+), 48 deletions(-)

diff --git a/src/mount/bsd.rs b/src/mount/bsd.rs
index 260e541bdb..f5f2a09f6f 100644
--- a/src/mount/bsd.rs
+++ b/src/mount/bsd.rs
@@ -86,49 +86,6 @@ libc_bitflags!(
         /// Indicates that the mount command is being applied to an already
         /// mounted file system.
         MNT_UPDATE;
-        ///// Exported read only.
-        //#[cfg(any(
-                //target_os = "dragonfly",
-                //target_os = "freebsd",
-                //target_os = "netbsd",
-                //target_os = "openbsd"
-        //))]
-        //MNT_EXRDONLY;
-        ///// Filesystem is exported.
-        //MNT_EXPORTED;
-        ///// Exported to the world.
-        //#[cfg(any(
-                //target_os = "dragonfly",
-                //target_os = "freebsd",
-                //target_os = "netbsd",
-                //target_os = "openbsd"
-        //))]
-        //MNT_DEFEXPORTED;
-        ///// Anon uid mapping for all.
-        //#[cfg(any(
-                //target_os = "dragonfly",
-                //target_os = "freebsd",
-                //target_os = "netbsd",
-                //target_os = "openbsd"
-        //))]
-        //MNT_EXPORTANON;
-        ///// Exported with Kerberos.
-        //#[cfg(any(
-                //target_os = "dragonfly",
-                //target_os = "freebsd",
-                //target_os = "netbsd",
-        //))]
-        //MNT_EXKERB;
-        ///// Public export (WebNFS).
-        //#[cfg(any(target_os = "dragonfly", target_os = "freebsd"))]
-        //MNT_EXPUBLIC;
-        ///// Delete export host lists.
-        //#[cfg(any(
-                //target_os = "dragonfly",
-                //target_os = "freebsd",
-                //target_os = "openbsd",
-        //))]
-        //MNT_DELEXPORT;
         /// Check vnode use counts.
         #[cfg(target_os = "freebsd")]
         MNT_NONBUSY;
@@ -364,11 +321,9 @@ impl<'a> Nmount<'a> {
     /// Nmount::new()
     ///     .str_opt_owned("fspath", mountpoint.to_str().unwrap());
     /// ```
-    pub fn str_opt_owned<P: ?Sized + NixPath>(
-        &mut self,
-        name: &P,
-        val: &P
-    ) -> &mut Self
+    pub fn str_opt_owned<P1, P2>(&mut self, name: &P1, val: &P2) -> &mut Self
+        where P1: ?Sized + NixPath,
+              P2: ?Sized + NixPath
     {
         name.with_nix_path(|s| {
             let len = s.to_bytes_with_nul().len();