From 15125ca6c2f5e98491acd68cb0ad7dfc778cb7e1 Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Wed, 8 Nov 2006 09:01:13 -0500 Subject: [PATCH] --- yaml --- r: 43275 b: refs/heads/master c: c594d8866460a2710c436839d79f334a0714a2a7 h: refs/heads/master i: 43273: 01e35d5aebcc8bfdd474a928bea614f3e8059162 43271: 6d5fa83895e1ffb56dfb11ab33a1820847f76ded v: v3 --- [refs] | 2 +- trunk/fs/gfs2/glock.c | 3 --- trunk/fs/gfs2/glock.h | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 57b6716969dc..2158d7466947 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6e58f01e8dc869803b9f73b2aa9d5bc3f32ca05 +refs/heads/master: c594d8866460a2710c436839d79f334a0714a2a7 diff --git a/trunk/fs/gfs2/glock.c b/trunk/fs/gfs2/glock.c index 44633c46717a..746347a404c4 100644 --- a/trunk/fs/gfs2/glock.c +++ b/trunk/fs/gfs2/glock.c @@ -1244,9 +1244,6 @@ int gfs2_glock_nq(struct gfs2_holder *gh) clear_bit(GLF_PREFETCH, &gl->gl_flags); - if (error == GLR_TRYFAILED && (gh->gh_flags & GL_DUMP)) - dump_glock(gl); - return error; } diff --git a/trunk/fs/gfs2/glock.h b/trunk/fs/gfs2/glock.h index 2b2a889ee2cc..b9856274df59 100644 --- a/trunk/fs/gfs2/glock.h +++ b/trunk/fs/gfs2/glock.h @@ -28,7 +28,6 @@ #define GL_NOCACHE 0x00000400 #define GL_NOCANCEL 0x00001000 #define GL_AOP 0x00004000 -#define GL_DUMP 0x00008000 #define GLR_TRYFAILED 13 #define GLR_CANCELED 14