[Ocfs2-tools-devel] [PATCH] Improvement to tunefs.ocfs2 online resize to handle symbolic link

[Jiaju Zhang]

Hi,

This is a simple patch which fix the issue that tunefs.ocfs2 online
resize can't handle symbolic link of a device file. For example, in
the LVM using scenario, '/dev/vg1/lv1' and '/dev/mapper/vg1-lv1' are
the same device, '/dev/vg1/lv1' is just a symbolic link to
'/dev/mapper/vg1-lv1'. But if we try to do online resize like
'tunefs.ocfs2 -S /dev/vg1/lv1', it fails.

Any review and comments are highly appreciated!

Thanks a lot,
Jiaju

Signed-off-by: Jiaju Zhang <jjzhang.linux at gmail.com>
---
 ocfs2_controld/mount.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ocfs2_controld/mount.c b/ocfs2_controld/mount.c
index 36459d1..076f727 100644
--- a/ocfs2_controld/mount.c
+++ b/ocfs2_controld/mount.c
@@ -260,11 +260,13 @@ static void add_service(struct mountgroup *mg, const char *device,
 			   const char *service, int ci, int fd)
 {
 	struct service *ms;
+	struct stat st1, st2;
 
 	log_debug("Adding service %s to device %s uuid %s",
 		  service, device, mg->mg_uuid);
 
-	if (strcmp(mg->mg_device, device)) {
+	if (!stat(mg->mg_device, &st1) && !stat(device, &st2)
+	    && st1.st_rdev != st2.st_rdev) {
 		fill_error(mg, EINVAL,
 			   "Trying to mount fs %s on device %s, but it is already mounted from device %s",
 			   mg->mg_uuid, device, mg->mg_device);