From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Tue, 7 Aug 2012 21:22:15 +0000 (-0700)
Subject: hammer2 - Add pfs-fsid, pfs-clid directive
X-Git-Tag: v3.4.0rc~1045
X-Git-Url: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/964e3b0142930fff7dbf49b5cf1c52720853c981

hammer2 - Add pfs-fsid, pfs-clid directive

* Add commands to retrieve specific uuid's for named PFSs.
---

diff --git a/sbin/hammer2/cmd_pfs.c b/sbin/hammer2/cmd_pfs.c
index 60a59c2..03c3566 100644
--- a/sbin/hammer2/cmd_pfs.c
+++ b/sbin/hammer2/cmd_pfs.c
@@ -57,7 +57,7 @@ cmd_pfs_list(const char *sel_path)
 		}
 		if (count == 0) {
 			printf("Type        "
-			       "Pfs_id                               "
+			       "ClusterId (pfs_clid)                 "
 			       "Label\n");
 		}
 		switch(pfs.pfs_type) {
@@ -102,6 +102,37 @@ cmd_pfs_list(const char *sel_path)
 }
 
 int
+cmd_pfs_getid(const char *sel_path, const char *name, int privateid)
+{
+	hammer2_ioc_pfs_t pfs;
+	int ecode = 0;
+	int fd;
+	uint32_t status;
+	char *pfs_id_str = NULL;
+
+	if ((fd = hammer2_ioctl_handle(sel_path)) < 0)
+		return(1);
+	bzero(&pfs, sizeof(pfs));
+
+	snprintf(pfs.name, sizeof(pfs.name), "%s", name);
+	if (ioctl(fd, HAMMER2IOC_PFS_LOOKUP, &pfs) < 0) {
+		perror("ioctl");
+		ecode = 1;
+	} else {
+		if (privateid)
+			uuid_to_string(&pfs.pfs_fsid, &pfs_id_str, &status);
+		else
+			uuid_to_string(&pfs.pfs_clid, &pfs_id_str, &status);
+		printf("%s\n", pfs_id_str);
+		free(pfs_id_str);
+		pfs_id_str = NULL;
+	}
+	close(fd);
+	return (ecode);
+}
+
+
+int
 cmd_pfs_create(const char *sel_path, const char *name,
 	       uint8_t pfs_type, const char *uuid_str)
 {