From: teigland@sourceware.org <teigland@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] cluster/gfs-kernel/src/gfs diaper.c
Date: 26 Jun 2006 21:53:51 -0000 [thread overview]
Message-ID: <20060626215351.10765.qmail@sourceware.org> (raw)
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);
reply other threads:[~2006-06-26 21:53 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20060626215351.10765.qmail@sourceware.org \
--to=teigland@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.