Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus

[firefly-linux-kernel-4.4.55.git] / fs / gfs2 / glock.h

diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h
index 32572f71f0278d9eb7b8d13a47b72a793e0f1630..f7cdaa8b4c839f32bc1d3ab895334cbd1b9ba9f2 100644 (file)
--- a/fs/gfs2/glock.h
+++ b/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 */
-       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))
@@ -151,7 +151,7 @@ static inline struct gfs2_holder *gfs2_glock_is_locked_by_me(struct gfs2_glock *
        }
        gh = NULL;
 out:
-       spin_unlock(&gl->gl_spin);
+       spin_unlock(&gl->gl_lockref.lock);
 
        return gh;
 }