diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2016-06-17 14:31:27 +0200 |
|---|---|---|
| committer | Bob Peterson <rpeterso@redhat.com> | 2016-06-27 16:47:09 +0200 |
| commit | 6df9f9a253c7dc9f8ed18bf89d762de350a31813 (patch) | |
| tree | a048f6fb09f9da9d1616b7f5a9c9254ce6f1d7ab /fs/gfs2/file.c | |
| parent | gfs2: Large-filesystem fix for 32-bit systems (diff) | |
| download | linux-6df9f9a253c7dc9f8ed18bf89d762de350a31813.tar.xz linux-6df9f9a253c7dc9f8ed18bf89d762de350a31813.zip | |
gfs2: Lock holder cleanup
Make the code more readable by cleaning up the different ways of
initializing lock holders and checking for initialized lock holders:
mark lock holders as uninitialized by setting the holder's glock to NULL
(gfs2_holder_mark_uninitialized) instead of zeroing out the entire
object or using a separate flag. Recognize initialized holders by their
non-NULL glock (gfs2_holder_initialized). Don't zero out holder objects
which are immeditiately initialized via gfs2_holder_init or
gfs2_glock_nq_init.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Diffstat (limited to 'fs/gfs2/file.c')
| -rw-r--r-- | fs/gfs2/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index e0f98e483aec..320e65e61938 100644 --- 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); } |