git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/asoc' into for-linus
[pandora-kernel.git]
/
fs
/
gfs2
/
glock.c
diff --git
a/fs/gfs2/glock.c
b/fs/gfs2/glock.c
index
1afd9f2
..
ff49810
100644
(file)
--- a/
fs/gfs2/glock.c
+++ b/
fs/gfs2/glock.c
@@
-1304,6
+1304,7
@@
static int gfs2_shrink_glock_memory(int nr, gfp_t gfp_mask)
nr--;
if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
gfs2_glock_put(gl);
nr--;
if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
gfs2_glock_put(gl);
+ got_ref = 0;
}
spin_lock(&lru_lock);
if (may_demote)
}
spin_lock(&lru_lock);
if (may_demote)