From 1633ede47474aa581dd99d62002327429b1b4702 Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Thu, 14 Sep 2006 13:57:38 -0400 Subject: [PATCH] --- yaml --- r: 38855 b: refs/heads/master c: a8336344a5fd1366eb3616d351c39cadcd077f43 h: refs/heads/master i: 38853: d4afd11f6aa8b3e0d8d15aa5d76dfd91915a6848 38851: 4d1cb26f2ea30f3a465161b78ab5ac319ffe00bf 38847: 96bcc28e081ec56fcc96b24489d2976c908f5369 v: v3 --- [refs] | 2 +- trunk/fs/gfs2/glock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 91840f42c517..0c43761f91dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: faa31ce85f626dff30ba865684bd1f0ad97a9ca0 +refs/heads/master: a8336344a5fd1366eb3616d351c39cadcd077f43 diff --git a/trunk/fs/gfs2/glock.c b/trunk/fs/gfs2/glock.c index 2316490723c0..64a1676e5f48 100644 --- a/trunk/fs/gfs2/glock.c +++ b/trunk/fs/gfs2/glock.c @@ -1892,7 +1892,6 @@ static int examine_bucket(glock_examiner examiner, struct gfs2_sbd *sdp, /* Can't use hlist_for_each_entry - don't want prefetch here */ if (hlist_empty(head)) goto out; - has_entries = 1; gl = list_entry(head->first, struct gfs2_glock, gl_list); while(1) { if (gl->gl_sbd == sdp) { @@ -1902,6 +1901,7 @@ static int examine_bucket(glock_examiner examiner, struct gfs2_sbd *sdp, gfs2_glock_put(prev); prev = gl; examiner(gl); + has_entries = 1; read_lock(gl_lock_addr(hash)); } if (gl->gl_list.next == NULL)