From mboxrd@z Thu Jan  1 00:00:00 1970
From: teigland@sourceware.org <teigland@sourceware.org>
Date: 26 Jun 2006 21:53:51 -0000
Subject: [Cluster-devel] cluster/gfs-kernel/src/gfs diaper.c
Message-ID: <20060626215351.10765.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	teigland at sourceware.org	2006-06-26 21:53:51

Modified files:
	gfs-kernel/src/gfs: diaper.c 

Log message:
	for 2.6.17
	bd_sem -> bd_mutex
	bd_mount_sem -> bd_mount_mutex

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/diaper.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.1.2.1.4.1&r2=1.1.2.1.4.1.2.1

--- cluster/gfs-kernel/src/gfs/diaper.c	2005/05/05 23:24:16	1.1.2.1.4.1
+++ cluster/gfs-kernel/src/gfs/diaper.c	2006/06/26 21:53:51	1.1.2.1.4.1.2.1
@@ -232,9 +232,9 @@
 	struct inode *inode;
 	int error;
 
-	down(&real->bd_mount_sem);
+	mutex_lock(&real->bd_mount_mutex);
 	sb = sget(&gfs_fs_type, gfs_test_bdev_super, gfs_set_bdev_super, real);
-	up(&real->bd_mount_sem);
+	mutex_unlock(&real->bd_mount_mutex);
 	if (IS_ERR(sb))
 		return PTR_ERR(sb);
 
@@ -363,7 +363,7 @@
 	if (!diaper)
 		goto fail_remove;
 
-	down(&diaper->bd_sem);
+	mutex_lock(&diaper->bd_mutex);
 	if (!diaper->bd_openers) {
 		diaper->bd_disk = gd;
 		diaper->bd_contains = diaper;
@@ -372,7 +372,7 @@
 	} else
 		printk("GFS: diaper: reopening\n");
 	diaper->bd_openers++;
-	up(&diaper->bd_sem);
+	mutex_unlock(&diaper->bd_mutex);
 
 	dh->dh_mempool = mempool_create(512,
 					mempool_alloc_slab, mempool_free_slab,
@@ -395,14 +395,14 @@
 	mempool_destroy(dh->dh_mempool);
 
  fail_bdput:
-	down(&diaper->bd_sem);
+	mutex_lock(&diaper->bd_mutex);
 	if (!--diaper->bd_openers) {
 		invalidate_bdev(diaper, 1);
 		diaper->bd_contains = NULL;
 		diaper->bd_disk = NULL;
 	} else
 		printk("GFS: diaper: not closed\n");
-	up(&diaper->bd_sem);
+	mutex_unlock(&diaper->bd_mutex);
 	bdput(diaper);	
 
  fail_remove:
@@ -437,14 +437,14 @@
 
 	mempool_destroy(dh->dh_mempool);
 
-	down(&diaper->bd_sem);
+	mutex_lock(&diaper->bd_mutex);
 	if (!--diaper->bd_openers) {
 		invalidate_bdev(diaper, 1);
 		diaper->bd_contains = NULL;
 		diaper->bd_disk = NULL;
 	} else
 		printk("GFS: diaper: not closed\n");
-	up(&diaper->bd_sem);
+	mutex_unlock(&diaper->bd_mutex);
 
 	bdput(diaper);
 	del_gendisk(gd);