From 6a3d7a53e4c9ca2e06e8c6043db86c08eba4d481 Mon Sep 17 00:00:00 2001
From: Bob Peterson <rpeterso@redhat.com>
Date: Thu, 23 Sep 2010 08:21:45 -0500
Subject: [PATCH] GFS2 mount fails incorrectly after correctly failed second-mount attempt

When a user attempts to mount a GFS2 file system to a second mount
point, gfs_controld was not properly storing the id of the second
mount point in its mount point information.  If the mount attempt
fails, (for example, due to mount options incompatible with the
original mount), the mount point information was not being deleted
properly because of the missing id.  That caused subsequent mount
attempts to fail.  This patch stores the ID in the mount point
information so that it can be found later and removed properly for
failed mounts.

rhbz#559735
---
 group/gfs_controld/recover.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/group/gfs_controld/recover.c b/group/gfs_controld/recover.c
index 597516c..b33b3fd 100644
--- a/group/gfs_controld/recover.c
+++ b/group/gfs_controld/recover.c
@@ -1559,6 +1559,7 @@ int add_another_mountpoint(struct mountgroup *mg, char *dir, char *dev, int ci)
 	memset(mp, 0, sizeof(struct mountpoint));
 	strncpy(mp->dir, dir, sizeof(mp->dir));
 	list_add(&mp->list, &mg->mountpoints);
+	mp->client = ci;
 	mg->mount_client = ci;
 
 	/* we return this special error to mount.gfs which mount.gfs will
-- 
1.7.2.2