From mboxrd@z Thu Jan 1 00:00:00 1970 From: cfeist@sourceware.org Date: 19 Jul 2007 22:08:19 -0000 Subject: [Cluster-devel] cluster/gfs-kernel/src/gulm gulm_jid.c Message-ID: <20070719220819.16218.qmail@sourceware.org> List-Id: 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: 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); } /**