diff options
Diffstat (limited to 'fs/gfs2')
-rw-r--r-- | fs/gfs2/glock.c | 2 | ||||
-rw-r--r-- | fs/gfs2/incore.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index 90847e0957bb..8e4b55a2bd77 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c | |||
@@ -1568,8 +1568,6 @@ static void blocking_cb(struct gfs2_sbd *sdp, struct lm_lockname *name, | |||
1568 | if (!gl) | 1568 | if (!gl) |
1569 | return; | 1569 | return; |
1570 | 1570 | ||
1571 | if (gl->gl_ops->go_callback) | ||
1572 | gl->gl_ops->go_callback(gl, state); | ||
1573 | handle_callback(gl, state); | 1571 | handle_callback(gl, state); |
1574 | 1572 | ||
1575 | spin_lock(&gl->gl_spin); | 1573 | spin_lock(&gl->gl_spin); |
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index dc024b18ea96..1acbcc2415ee 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h | |||
@@ -110,7 +110,6 @@ struct gfs2_glock_operations { | |||
110 | int (*go_demote_ok) (struct gfs2_glock *gl); | 110 | int (*go_demote_ok) (struct gfs2_glock *gl); |
111 | int (*go_lock) (struct gfs2_holder *gh); | 111 | int (*go_lock) (struct gfs2_holder *gh); |
112 | void (*go_unlock) (struct gfs2_holder *gh); | 112 | void (*go_unlock) (struct gfs2_holder *gh); |
113 | void (*go_callback) (struct gfs2_glock *gl, unsigned int state); | ||
114 | const int go_type; | 113 | const int go_type; |
115 | }; | 114 | }; |
116 | 115 | ||