git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[safe/jmp/linux-2.6]
/
fs
/
gfs2
/
lock_dlm.c
diff --git
a/fs/gfs2/lock_dlm.c
b/fs/gfs2/lock_dlm.c
index
a0bb7d2
..
46df988
100644
(file)
--- a/
fs/gfs2/lock_dlm.c
+++ b/
fs/gfs2/lock_dlm.c
@@
-46,11
+46,11
@@
static void gdlm_ast(void *arg)
BUG();
}
BUG();
}
- ret = gl->gl_
target
;
+ ret = gl->gl_
req
;
if (gl->gl_lksb.sb_flags & DLM_SBF_ALTMODE) {
if (gl->gl_lksb.sb_flags & DLM_SBF_ALTMODE) {
- if (gl->gl_
target
== LM_ST_SHARED)
+ if (gl->gl_
req
== LM_ST_SHARED)
ret = LM_ST_DEFERRED;
ret = LM_ST_DEFERRED;
- else if (gl->gl_
target
== LM_ST_DEFERRED)
+ else if (gl->gl_
req
== LM_ST_DEFERRED)
ret = LM_ST_SHARED;
else
BUG();
ret = LM_ST_SHARED;
else
BUG();
@@
-147,6
+147,7
@@
static unsigned int gdlm_lock(struct gfs2_glock *gl,
int req;
u32 lkf;
int req;
u32 lkf;
+ gl->gl_req = req_state;
req = make_mode(req_state);
lkf = make_flags(gl->gl_lksb.sb_lkid, flags, req);
req = make_mode(req_state);
lkf = make_flags(gl->gl_lksb.sb_lkid, flags, req);