Merge tag 'gpio-v4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

[cascardo/linux.git] / fs / gfs2 / file.c

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index e0f98e4..320e65e 100644 (file)
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -1098,7 +1098,7 @@ static void do_unflock(struct file *file, struct file_lock *fl)
 
        mutex_lock(&fp->f_fl_mutex);
        locks_lock_file_wait(file, fl);
-       if (fl_gh->gh_gl) {
+       if (gfs2_holder_initialized(fl_gh)) {
                gfs2_glock_dq(fl_gh);
                gfs2_holder_uninit(fl_gh);
        }