[Ocfs2-tools-devel] [PATCH 5/6] mount.ocfs2, ocfs2_hb_ctl: Use OCFS2_FS_NAME as the mount service

[Joel Becker]

Use OCFS2_FS_NAME as the service for actual mounts.

Signed-off-by: Joel Becker <joel.becker at oracle.com>
---
 mount.ocfs2/mount.ocfs2.c   |    2 +-
 mount.ocfs2/umount.ocfs2.c  |    2 +-
 ocfs2_hb_ctl/ocfs2_hb_ctl.c |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/mount.ocfs2/mount.ocfs2.c b/mount.ocfs2/mount.ocfs2.c
index ed84c9f..a97b4cb 100644
--- a/mount.ocfs2/mount.ocfs2.c
+++ b/mount.ocfs2/mount.ocfs2.c
@@ -327,7 +327,7 @@ int main(int argc, char **argv)
 			goto bail;
 		}
 		desc.r_persist = 1;
-		desc.r_service = mo.dir;
+		desc.r_service = OCFS2_FS_NAME;
 
 		ret = o2cb_get_hb_ctl_path(hb_ctl_path, sizeof(hb_ctl_path));
 		if (ret) {
diff --git a/mount.ocfs2/umount.ocfs2.c b/mount.ocfs2/umount.ocfs2.c
index fe49753..464d4a9 100644
--- a/mount.ocfs2/umount.ocfs2.c
+++ b/mount.ocfs2/umount.ocfs2.c
@@ -211,7 +211,7 @@ int main(int argc, char **argv)
 			goto bail;
 		}
 		desc.r_persist = 1;
-		desc.r_service = mo.dir;
+		desc.r_service = OCFS2_FS_NAME;
 	}
 
 	block_signals (SIG_BLOCK);
diff --git a/ocfs2_hb_ctl/ocfs2_hb_ctl.c b/ocfs2_hb_ctl/ocfs2_hb_ctl.c
index d0cc478..4332f70 100644
--- a/ocfs2_hb_ctl/ocfs2_hb_ctl.c
+++ b/ocfs2_hb_ctl/ocfs2_hb_ctl.c
@@ -45,7 +45,6 @@
 #define DEV_PREFIX      "/dev/"
 #define PROC_IDE_FORMAT "/proc/ide/%s/media"
 #define IONICE_PATH	"/usr/bin/ionice"
-#define MOUNT_SERVICE	"mount.ocfs2"
 
 enum hb_ctl_action {
 	HB_ACTION_UNKNOWN,
@@ -481,7 +480,7 @@ static int process_options(struct hb_ctl_options *hbo)
 			 * with uuid_str and ! service.  In that case only
 			 * we fill in the service */
 			if (hbo->uuid_str)
-				hbo->service = strdup(MOUNT_SERVICE);
+				hbo->service = strdup(OCFS2_FS_NAME);
 			else
 				ret = -EINVAL;
 		}
-- 
1.5.4.5