cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
From: adas@sourceware.org <adas@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] cluster/gfs2/mkfs main_jadd.c
Date: 30 Aug 2006 18:32:36 -0000	[thread overview]
Message-ID: <20060830183236.9437.qmail@sourceware.org> (raw)

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	adas at sourceware.org	2006-08-30 18:32:36

Modified files:
	gfs2/mkfs      : main_jadd.c 

Log message:
	fix for bz 190204. gfs2_jadd uses the gfs2meta filesystem to add journals to an existing gfs2 fs

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/main_jadd.c.diff?cvsroot=cluster&r1=1.7&r2=1.8

--- cluster/gfs2/mkfs/main_jadd.c	2006/07/20 22:54:25	1.7
+++ cluster/gfs2/mkfs/main_jadd.c	2006/08/30 18:32:36	1.8
@@ -515,7 +515,8 @@
 			   &fspass) != 6)
 			continue;
 		
-		if (strcmp(meta_device, sdp->device_name) != 0)
+		if (strcmp(meta_device, sdp->device_name) != 0
+		    && strcmp(meta_device, sdp->path_name) != 0)
 			continue;
 		
 		metafs_mounted = 1;
@@ -652,11 +653,7 @@
 	check_for_gfs2(sdp);
 
 	gather_info(sdp);
-	/* umount gfs2 to be able to mount gfs2meta */
-	{
-		close(sdp->path_fd);
-		umount(sdp->path_name);
-	}
+
 	if (!find_gfs2_meta(sdp))
 		mount_gfs2_meta(sdp);
 	lock_for_admin(sdp);
@@ -675,7 +672,7 @@
 	}
 
 	close(metafs_fd);
-	//close(sdp->path_fd);
+	close(sdp->path_fd);
 
 	cleanup(sdp);
 



             reply	other threads:[~2006-08-30 18:32 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-08-30 18:32 adas [this message]
  -- strict thread matches above, loose matches on Subject: below --
2006-09-28 16:23 [Cluster-devel] cluster/gfs2/mkfs main_jadd.c adas
2006-07-20 22:54 adas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060830183236.9437.qmail@sourceware.org \
    --to=adas@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).