gfs2: Lock holder cleanup (fixup)

Function gfs2_holder_initialized should be used in do_flock as well.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index c2062a1..bb48074 100644 (file)
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -1030,8 +1030,7 @@ static int do_flock(struct file *file, int cmd, struct file_lock *fl)
 
        mutex_lock(&fp->f_fl_mutex);
 
-       gl = fl_gh->gh_gl;
-       if (gl) {
+       if (gfs2_holder_initialized(fl_gh)) {
                if (fl_gh->gh_state == state)
                        goto out;
                locks_lock_file_wait(file,