Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Inform TSC deadline clockevent device about recalibration"
[kvmfornfv.git]
/
kernel
/
fs
/
gfs2
/
glock.h
diff --git
a/kernel/fs/gfs2/glock.h
b/kernel/fs/gfs2/glock.h
index
32572f7
..
f7cdaa8
100644
(file)
--- a/
kernel/fs/gfs2/glock.h
+++ b/
kernel/fs/gfs2/glock.h
@@
-141,7
+141,7
@@
static inline struct gfs2_holder *gfs2_glock_is_locked_by_me(struct gfs2_glock *
struct pid *pid;
/* Look in glock's list of holders for one with current task as owner */
struct pid *pid;
/* Look in glock's list of holders for one with current task as owner */
- spin_lock(&gl->gl_
spin
);
+ spin_lock(&gl->gl_
lockref.lock
);
pid = task_pid(current);
list_for_each_entry(gh, &gl->gl_holders, gh_list) {
if (!test_bit(HIF_HOLDER, &gh->gh_iflags))
pid = task_pid(current);
list_for_each_entry(gh, &gl->gl_holders, gh_list) {
if (!test_bit(HIF_HOLDER, &gh->gh_iflags))
@@
-151,7
+151,7
@@
static inline struct gfs2_holder *gfs2_glock_is_locked_by_me(struct gfs2_glock *
}
gh = NULL;
out:
}
gh = NULL;
out:
- spin_unlock(&gl->gl_
spin
);
+ spin_unlock(&gl->gl_
lockref.lock
);
return gh;
}
return gh;
}