Cluster Project branch, RHEL5, updated. cmirror_1_1_15-96-ge2862be

[teigland@sourceware.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=e2862bea480908959ebc2bb8c381fc3ddcf721f7

The branch, RHEL5 has been updated
       via  e2862bea480908959ebc2bb8c381fc3ddcf721f7 (commit)
      from  d5a191ac885f866080bc6a1c8646a79df19ae624 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e2862bea480908959ebc2bb8c381fc3ddcf721f7
Author: Mark Hlawatschek <hlawatschek@atix.de>
Date:   Mon Jun 2 10:56:25 2008 -0500

    mount.gfs2: skip mtab updates
    
    Skip updates to /etc/mtab when it's a link to /proc/mounts (which is the
    case for shared root gfs, for example.)
    
    bz 318271 (RHEL5)
    
    Signed-off-by: David Teigland <teigland@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 gfs2/mount/mtab.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/gfs2/mount/mtab.c b/gfs2/mount/mtab.c
index 21b0c8c..dda5935 100644
--- a/gfs2/mount/mtab.c
+++ b/gfs2/mount/mtab.c
@@ -95,6 +95,9 @@ void add_mtab_entry(struct mount_options *mo)
 
 	read_proc_mounts(mo);
 
+	if (ignore_mtab())
+		return;
+
 	lock_mtab();
 
 	file = fopen("/etc/mtab", "a");
@@ -125,6 +128,9 @@ void del_mtab_entry(struct mount_options *mo)
 	struct stat sbuf;
 	int found = 0;
 
+	if (ignore_mtab())
+		return;
+
 	lock_mtab();
 
 	old_umask = umask(077);


hooks/post-receive
--
Cluster Project