From a231693eff5c9e29328489095aff080b0b7d29bb Mon Sep 17 00:00:00 2001
From: Michael Neumann <mneumann@dragonflybsd.org>
Date: Thu, 26 Jun 2008 16:13:43 +0000
Subject: [PATCH] We only need to determine the softlink_dir when no filesystem
 is explicitly specified.

---
 sbin/hammer/cmd_snapshot.c | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/sbin/hammer/cmd_snapshot.c b/sbin/hammer/cmd_snapshot.c
index bbfd81619c..b35aa54958 100644
--- a/sbin/hammer/cmd_snapshot.c
+++ b/sbin/hammer/cmd_snapshot.c
@@ -31,7 +31,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $DragonFly: src/sbin/hammer/cmd_snapshot.c,v 1.3 2008/06/26 15:56:44 mneumann Exp $
+ * $DragonFly: src/sbin/hammer/cmd_snapshot.c,v 1.4 2008/06/26 16:13:43 mneumann Exp $
  */
 
 #include "hammer.h"
@@ -51,7 +51,6 @@ void
 hammer_cmd_snapshot(char **av, int ac)
 {
 	char *softlink_fmt;
-	char *softlink_dir;
 	const char *filesystem;
 	struct statfs buf;
 	struct hammer_ioc_synctid synctid;
@@ -71,34 +70,34 @@ hammer_cmd_snapshot(char **av, int ac)
 		snapshot_usage(1);
 	}
 
-	/*
-	 * Determine softlink directory
-	 */
-	softlink_dir = strdup(softlink_fmt);
-	fd = open(softlink_dir, O_RDONLY);
-	if (fd < 0) {
-		/* strip-off last '/path' segment */
-		char *pos = strrchr(softlink_dir, '/');
-		if (pos != NULL)
-			*pos = '\0';
+	if (filesystem == NULL) {
+		/*
+		 * Determine softlink directory required to
+		 * determine the filesystem we are on.
+		 */
+		char *softlink_dir = strdup(softlink_fmt);
 		fd = open(softlink_dir, O_RDONLY);
 		if (fd < 0) {
-			err(2, "Unable to determine softlink dir %s",
-			    softlink_dir);
+			/* strip-off last '/path' segment */
+			char *pos = strrchr(softlink_dir, '/');
+			if (pos != NULL)
+				*pos = '\0';
+			fd = open(softlink_dir, O_RDONLY);
+			if (fd < 0) {
+				err(2, "Unable to determine softlink dir %s",
+				    softlink_dir);
+			}
 		}
-	}
-	close(fd);
+		close(fd);
 
-	if (filesystem == NULL) {
 		if (statfs(softlink_dir, &buf) != 0) {
 			err(2, "Unable to determine filesystem of %s",
 			    softlink_dir);
 		}
 		filesystem = buf.f_mntonname;
+		free(softlink_dir);
 	}
 
-	free(softlink_dir);
-
 	/*
 	 * Synctid 
 	 */
-- 
2.11.4.GIT