diff options
Diffstat (limited to 'fs/gfs2')
-rw-r--r-- | fs/gfs2/incore.h | 1 | ||||
-rw-r--r-- | fs/gfs2/lock_dlm.c | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index 980a0864ca6c..399d1b978049 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h | |||
@@ -203,6 +203,7 @@ struct gfs2_glock { | |||
203 | unsigned int gl_target; | 203 | unsigned int gl_target; |
204 | unsigned int gl_reply; | 204 | unsigned int gl_reply; |
205 | unsigned int gl_hash; | 205 | unsigned int gl_hash; |
206 | unsigned int gl_req; | ||
206 | unsigned int gl_demote_state; /* state requested by remote node */ | 207 | unsigned int gl_demote_state; /* state requested by remote node */ |
207 | unsigned long gl_demote_time; /* time of first demote request */ | 208 | unsigned long gl_demote_time; /* time of first demote request */ |
208 | struct list_head gl_holders; | 209 | struct list_head gl_holders; |
diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c index a0bb7d2251a0..46df988323bc 100644 --- a/fs/gfs2/lock_dlm.c +++ b/fs/gfs2/lock_dlm.c | |||
@@ -46,11 +46,11 @@ static void gdlm_ast(void *arg) | |||
46 | BUG(); | 46 | BUG(); |
47 | } | 47 | } |
48 | 48 | ||
49 | ret = gl->gl_target; | 49 | ret = gl->gl_req; |
50 | if (gl->gl_lksb.sb_flags & DLM_SBF_ALTMODE) { | 50 | if (gl->gl_lksb.sb_flags & DLM_SBF_ALTMODE) { |
51 | if (gl->gl_target == LM_ST_SHARED) | 51 | if (gl->gl_req == LM_ST_SHARED) |
52 | ret = LM_ST_DEFERRED; | 52 | ret = LM_ST_DEFERRED; |
53 | else if (gl->gl_target == LM_ST_DEFERRED) | 53 | else if (gl->gl_req == LM_ST_DEFERRED) |
54 | ret = LM_ST_SHARED; | 54 | ret = LM_ST_SHARED; |
55 | else | 55 | else |
56 | BUG(); | 56 | BUG(); |
@@ -147,6 +147,7 @@ static unsigned int gdlm_lock(struct gfs2_glock *gl, | |||
147 | int req; | 147 | int req; |
148 | u32 lkf; | 148 | u32 lkf; |
149 | 149 | ||
150 | gl->gl_req = req_state; | ||
150 | req = make_mode(req_state); | 151 | req = make_mode(req_state); |
151 | lkf = make_flags(gl->gl_lksb.sb_lkid, flags, req); | 152 | lkf = make_flags(gl->gl_lksb.sb_lkid, flags, req); |
152 | 153 | ||