summaryrefslogtreecommitdiffstats
path: root/fs/gfs2
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruenba@redhat.com>2017-07-17 13:39:15 -0500
committerBob Peterson <rpeterso@redhat.com>2017-07-17 13:39:15 -0500
commit283c9a97be1d7ab2cce2630b5f6cc793f3b387a1 (patch)
treebb6096c703a4eb97e83f1586b6fd3c3ef75b1a58 /fs/gfs2
parent61eaadcd52924b8015ee57b9abd3844c5f9e03a8 (diff)
downloadop-kernel-dev-283c9a97be1d7ab2cce2630b5f6cc793f3b387a1.zip
op-kernel-dev-283c9a97be1d7ab2cce2630b5f6cc793f3b387a1.tar.gz
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>
Diffstat (limited to 'fs/gfs2')
-rw-r--r--fs/gfs2/file.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index c2062a1..bb48074 100644
--- 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,
OpenPOWER on IntegriCloud