* [Cluster-devel] cluster/gfs-kernel/src/gulm gulm_jid.c
@ 2007-07-09 22:23 cfeist
0 siblings, 0 replies; 2+ messages in thread
From: cfeist @ 2007-07-09 22:23 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL4
Changes by: cfeist at sourceware.org 2007-07-09 22:23:03
Modified files:
gfs-kernel/src/gulm: gulm_jid.c
Log message:
Josef's change to remove some extra jid locking.
Fixes bz#237678
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gulm/gulm_jid.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.10&r2=1.10.2.1
--- cluster/gfs-kernel/src/gulm/Attic/gulm_jid.c 2004/12/22 14:18:32 1.10
+++ cluster/gfs-kernel/src/gulm/Attic/gulm_jid.c 2007/07/09 22:23:02 1.10.2.1
@@ -296,7 +296,6 @@
keylen = sizeof (key);
jid_get_header_name (fs->fs_name, key, &keylen);
- down (&fs->headerlock);
jid_get_lock_state_lvb (key, keylen, lg_lock_state_Exclusive, lvb,
jid_header_lvb_size);
jidc = (uint32_t) (lvb[0]) << 0;
@@ -315,7 +314,6 @@
*/
jid_rehold_lvbs (fs);
- up (&fs->headerlock);
}
/**
@@ -498,7 +496,6 @@
uint8_t key[GIO_KEY_SIZE], lvb[64];
uint16_t keylen = GIO_KEY_SIZE;
- down (&fs->headerlock); /*???*/
for (i = 0; i < fs->JIDcount; i++) {
keylen = sizeof (key);
jid_get_lock_name (fs->fs_name, i, key, &keylen);
@@ -515,7 +512,6 @@
jid_get_lock_state (key, keylen, lg_lock_state_Unlock);
}
- up (&fs->headerlock);
return found;
}
@@ -535,7 +531,6 @@
uint16_t keylen = GIO_KEY_SIZE;
unsigned int ujid;
- down (&fs->headerlock); /*???*/
for (i = 0; i < fs->JIDcount; i++) {
keylen = sizeof (key);
jid_get_lock_name (fs->fs_name, i, key, &keylen);
@@ -551,7 +546,6 @@
fs->cb (fs->fsdata, LM_CB_NEED_RECOVERY, &ujid);
}
}
- up (&fs->headerlock);
}
@@ -614,11 +608,9 @@
gulm_fs_t *fs = (gulm_fs_t *) d;
jid_get_header_name (fs->fs_name, key, &keylen);
- down (&fs->headerlock);
jid_get_lock_state (key, keylen, lg_lock_state_Unlock);
jid_rehold_lvbs (fs);
- up (&fs->headerlock);
}
/**
^ permalink raw reply [flat|nested] 2+ messages in thread
* [Cluster-devel] cluster/gfs-kernel/src/gulm gulm_jid.c
@ 2007-07-19 22:08 cfeist
0 siblings, 0 replies; 2+ messages in thread
From: cfeist @ 2007-07-19 22:08 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL45
Changes by: cfeist at sourceware.org 2007-07-19 22:08:19
Modified files:
gfs-kernel/src/gulm: gulm_jid.c
Log message:
- RHEL45 z-stream commit of Josef's gulm patch to remove unnecessary jid
locking (237678, 248958).
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gulm/gulm_jid.c.diff?cvsroot=cluster&only_with_tag=RHEL45&r1=1.10&r2=1.10.16.1
--- cluster/gfs-kernel/src/gulm/Attic/gulm_jid.c 2004/12/22 14:18:32 1.10
+++ cluster/gfs-kernel/src/gulm/Attic/gulm_jid.c 2007/07/19 22:08:19 1.10.16.1
@@ -296,7 +296,6 @@
keylen = sizeof (key);
jid_get_header_name (fs->fs_name, key, &keylen);
- down (&fs->headerlock);
jid_get_lock_state_lvb (key, keylen, lg_lock_state_Exclusive, lvb,
jid_header_lvb_size);
jidc = (uint32_t) (lvb[0]) << 0;
@@ -315,7 +314,6 @@
*/
jid_rehold_lvbs (fs);
- up (&fs->headerlock);
}
/**
@@ -498,7 +496,6 @@
uint8_t key[GIO_KEY_SIZE], lvb[64];
uint16_t keylen = GIO_KEY_SIZE;
- down (&fs->headerlock); /*???*/
for (i = 0; i < fs->JIDcount; i++) {
keylen = sizeof (key);
jid_get_lock_name (fs->fs_name, i, key, &keylen);
@@ -515,7 +512,6 @@
jid_get_lock_state (key, keylen, lg_lock_state_Unlock);
}
- up (&fs->headerlock);
return found;
}
@@ -535,7 +531,6 @@
uint16_t keylen = GIO_KEY_SIZE;
unsigned int ujid;
- down (&fs->headerlock); /*???*/
for (i = 0; i < fs->JIDcount; i++) {
keylen = sizeof (key);
jid_get_lock_name (fs->fs_name, i, key, &keylen);
@@ -551,7 +546,6 @@
fs->cb (fs->fsdata, LM_CB_NEED_RECOVERY, &ujid);
}
}
- up (&fs->headerlock);
}
@@ -614,11 +608,9 @@
gulm_fs_t *fs = (gulm_fs_t *) d;
jid_get_header_name (fs->fs_name, key, &keylen);
- down (&fs->headerlock);
jid_get_lock_state (key, keylen, lg_lock_state_Unlock);
jid_rehold_lvbs (fs);
- up (&fs->headerlock);
}
/**
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-07-19 22:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-09 22:23 [Cluster-devel] cluster/gfs-kernel/src/gulm gulm_jid.c cfeist
-- strict thread matches above, loose matches on Subject: below --
2007-07-19 22:08 cfeist
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).