From affce8d3de14a8bdfa871ac8cec5638fa36b63c8 Mon Sep 17 00:00:00 2001
From: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Date: Sat, 8 Oct 2016 09:13:36 +0900
Subject: [PATCH] sbin/hammer: Change "PFS #" to "PFS#"

It's mostly "PFS#", so remove extra space between "PFS" and "#".
---
 sbin/hammer/cmd_cleanup.c  | 6 +++---
 sbin/hammer/cmd_pfs.c      | 6 +++---
 sbin/hammer/cmd_snapshot.c | 2 +-
 sbin/hammer/hammer.8       | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sbin/hammer/cmd_cleanup.c b/sbin/hammer/cmd_cleanup.c
index a4968efa57..c205188055 100644
--- a/sbin/hammer/cmd_cleanup.c
+++ b/sbin/hammer/cmd_cleanup.c
@@ -212,7 +212,7 @@ do_cleanup(const char *path)
 	 */
 	for (didpfs = FirstPFS; didpfs; didpfs = didpfs->next) {
 		if (bcmp(&didpfs->uuid, &mrec_tmp.pfs.pfsd.unique_uuid, sizeof(uuid_t)) == 0) {
-			printf(" PFS #%d already handled\n", pfs.pfs_id);
+			printf(" PFS#%d already handled\n", pfs.pfs_id);
 			close(fd);
 			return;
 		}
@@ -374,14 +374,14 @@ do_cleanup(const char *path)
 	 */
 	if (flock(fd, LOCK_EX|LOCK_NB) == -1) {
 		if (errno == EWOULDBLOCK)
-			printf(" PFS #%d locked by other process\n", pfs.pfs_id);
+			printf(" PFS#%d locked by other process\n", pfs.pfs_id);
 		else
 			printf(" can not lock %s: %s\n", config_path, strerror(errno));
 		close(fd);
 		return;
 	}
 
-	printf(" handle PFS #%d using %s\n", pfs.pfs_id, snapshots_path);
+	printf(" handle PFS#%d using %s\n", pfs.pfs_id, snapshots_path);
 
 	struct pidfh	*pfh = NULL;
 	static char	pidfile[PIDFILE_BUFSIZE];
diff --git a/sbin/hammer/cmd_pfs.c b/sbin/hammer/cmd_pfs.c
index d9b591f1a8..5d892259f5 100644
--- a/sbin/hammer/cmd_pfs.c
+++ b/sbin/hammer/cmd_pfs.c
@@ -228,7 +228,7 @@ print_pfs_status(char *path)
 	if (fd < 0 || ioctl(fd, HAMMERIOC_GET_PSEUDOFS, &pfs) < 0) {
 		printf("Invalid PFS path %s\n", path);
 	} else {
-		printf("PFS #%d {\n", pfs.pfs_id);
+		printf("PFS#%d {\n", pfs.pfs_id);
 		dump_pfsd(pfs.ondisk, fd);
 		printf("}\n");
 	}
@@ -331,7 +331,7 @@ hammer_cmd_pseudofs_create(char **av, int ac, int is_slave)
 	/*
 	 * Create the new PFS
 	 */
-	printf("Creating PFS #%d\t", pfs_id);
+	printf("Creating PFS#%d\t", pfs_id);
 	clrpfs(&pfs, &pfsd, pfs_id);
 	init_pfsd(&pfsd, is_slave);
 
@@ -389,7 +389,7 @@ hammer_cmd_pseudofs_destroy(char **av, int ac)
 		}
 	}
 
-	printf("Destroying PFS #%d (%s)", pfs.pfs_id, pfs.ondisk->label);
+	printf("Destroying PFS#%d (%s)", pfs.pfs_id, pfs.ondisk->label);
 	if (DebugOpt) {
 		printf("\n");
 	} else {
diff --git a/sbin/hammer/cmd_snapshot.c b/sbin/hammer/cmd_snapshot.c
index ed57e84d7d..5fad5a909f 100644
--- a/sbin/hammer/cmd_snapshot.c
+++ b/sbin/hammer/cmd_snapshot.c
@@ -504,7 +504,7 @@ snapshot_ls(const char *path)
 		/* not reached */
         }
 
-	printf("Snapshots on %s\tPFS #%d\n", path, pfs.pfs_id);
+	printf("Snapshots on %s\tPFS#%d\n", path, pfs.pfs_id);
 	printf("Transaction ID\t\tTimestamp\t\tNote\n");
 
 	bzero(&snapshot, sizeof(snapshot));
diff --git a/sbin/hammer/hammer.8 b/sbin/hammer/hammer.8
index dfb31e794d..9a4096fd17 100644
--- a/sbin/hammer/hammer.8
+++ b/sbin/hammer/hammer.8
@@ -421,7 +421,7 @@ search for the key printing nodes as it recurses down, and then
 will iterate forwards.
 These fields are specified in HEX.
 Note that the PFS id is the top 16 bits of the 32-bit localization
-field so PFS #1 would be 00010000.
+field so PFS#1 would be 00010000.
 .Pp
 If you use
 .Fl q
-- 
2.11.4.GIT