Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly

diff --cc sys/vfs/nfs/nfs_vfsops.c
index 1d3eb8f,04f68d7..ff62255
--- 1/sys/vfs/nfs/nfs_vfsops.c
--- 2/sys/vfs/nfs/nfs_vfsops.c
+++ b/sys/vfs/nfs/nfs_vfsops.c
@@@ -995,15 -995,8 +995,16 @@@ mountnfs(struct nfs_args *argp, struct 
         * Lose the lock but keep the ref.
         */
        vn_unlock(*vpp);
+       TAILQ_INSERT_TAIL(&nfs_mountq, nmp, nm_entry);
  
 +      /*
 +       * Start the reader and writer threads.
 +       */
 +      lwkt_create(nfssvc_iod_reader, nmp, &nmp->nm_rxthread,
 +                  NULL, 0, -1, "nfsiod_rx");
 +      lwkt_create(nfssvc_iod_writer, nmp, &nmp->nm_txthread,
 +                  NULL, 0, -1, "nfsiod_tx");
 +
        return (0);
  bad:
        nfs_disconnect(nmp);
@@@ -1057,11 -1050,10 +1058,12 @@@ nfs_unmount(struct mount *mp, int mntfl
  
        nfs_disconnect(nmp);
        FREE(nmp->nm_nam, M_SONAME);
+       TAILQ_REMOVE(&nfs_mountq, nmp, nm_entry);
  
 -      if ((nmp->nm_flag & NFSMNT_KERB) == 0)
 +      if ((nmp->nm_flag & NFSMNT_KERB) == 0) {
 +              nfssvc_iod_stop(nmp);
                nfs_free_mount(nmp);
 +      }
        return (0);
  }