From 1bcc92995aeb57aa1f0de822a4d584645a2db2b5 Mon Sep 17 00:00:00 2001
From: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Date: Tue, 18 Aug 2015 20:32:28 +0900
Subject: [PATCH] sys/vfs/hammer: Remove obsolete code and comments

from very early stage of hammer development.
---
 sys/vfs/hammer/hammer.h        |  1 -
 sys/vfs/hammer/hammer_vfsops.c |  9 +--------
 sys/vfs/hammer/hammer_vnops.c  | 10 ----------
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/sys/vfs/hammer/hammer.h b/sys/vfs/hammer/hammer.h
index d5dd4e9c6b..1a9297431a 100644
--- a/sys/vfs/hammer/hammer.h
+++ b/sys/vfs/hammer/hammer.h
@@ -866,7 +866,6 @@ struct hammer_flusher {
  */
 struct hammer_mount {
 	struct mount *mp;
-	/*struct vnode *rootvp;*/
 	struct hammer_ino_rb_tree rb_inos_root;
 	struct hammer_redo_rb_tree rb_redo_root;
 	struct hammer_vol_rb_tree rb_vols_root;
diff --git a/sys/vfs/hammer/hammer_vfsops.c b/sys/vfs/hammer/hammer_vfsops.c
index d7598974b0..670771c6d2 100644
--- a/sys/vfs/hammer/hammer_vfsops.c
+++ b/sys/vfs/hammer/hammer_vfsops.c
@@ -451,7 +451,6 @@ hammer_vfs_mount(struct mount *mp, char *mntpt, caddr_t data,
 		hmp = kmalloc(sizeof(*hmp), M_HAMMER, M_WAITOK | M_ZERO);
 		mp->mnt_data = (qaddr_t)hmp;
 		hmp->mp = mp;
-		/*TAILQ_INIT(&hmp->recycle_list);*/
 
 		/*
 		 * Make sure kmalloc type limits are set appropriately.
@@ -683,7 +682,6 @@ hammer_vfs_mount(struct mount *mp, char *mntpt, caddr_t data,
 	 * on return.
 	 */
 	mp->mnt_kern_flag |= MNTK_ALL_MPSAFE;
-	/*MNTK_RD_MPSAFE | MNTK_GA_MPSAFE | MNTK_IN_MPSAFE;*/
 
 	/*
 	 * note: f_iosize is used by vnode_pager_haspage() when constructing
@@ -792,17 +790,12 @@ hammer_vfs_mount(struct mount *mp, char *mntpt, caddr_t data,
 	hammer_flusher_create(hmp);
 
 	/*
-	 * Locate the root directory using the root cluster's B-Tree as a
-	 * starting point.  The root directory uses an obj_id of 1.
-	 *
-	 * FUTURE: Leave the root directory cached referenced but unlocked
-	 * in hmp->rootvp (need to flush it on unmount).
+	 * Locate the root directory with an obj_id of 1.
 	 */
 	error = hammer_vfs_vget(mp, NULL, HAMMER_OBJID_ROOT, &rootvp);
 	if (error)
 		goto done;
 	vput(rootvp);
-	/*vn_unlock(hmp->rootvp);*/
 	if (hmp->ronly == 0)
 		error = hammer_recover_stage2(hmp, rootvol);
 
diff --git a/sys/vfs/hammer/hammer_vnops.c b/sys/vfs/hammer/hammer_vnops.c
index abebc52332..96379490f7 100644
--- a/sys/vfs/hammer/hammer_vnops.c
+++ b/sys/vfs/hammer/hammer_vnops.c
@@ -45,7 +45,6 @@
 /*
  * USERFS VNOPS
  */
-/*static int hammer_vop_vnoperate(struct vop_generic_args *);*/
 static int hammer_vop_fsync(struct vop_fsync_args *);
 static int hammer_vop_read(struct vop_read_args *);
 static int hammer_vop_write(struct vop_write_args *);
@@ -166,15 +165,6 @@ static int hammer_dounlink(hammer_transaction_t trans, struct nchandle *nch,
 static int hammer_vop_strategy_read(struct vop_strategy_args *ap);
 static int hammer_vop_strategy_write(struct vop_strategy_args *ap);
 
-#if 0
-static
-int
-hammer_vop_vnoperate(struct vop_generic_args *)
-{
-	return (VOCALL(&hammer_vnode_vops, ap));
-}
-#endif
-
 /*
  * hammer_vop_fsync { vp, waitfor }
  *
-- 
2.41.0