diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2016-06-17 07:31:27 -0500 |
|---|---|---|
| committer | Bob Peterson <rpeterso@redhat.com> | 2016-06-27 09:47:09 -0500 |
| commit | 6df9f9a253c7dc9f8ed18bf89d762de350a31813 (patch) | |
| tree | a048f6fb09f9da9d1616b7f5a9c9254ce6f1d7ab /fs/gfs2/dentry.c | |
| parent | cda9dd4207aeb29d0aa2298085cc2d1ebcb87e04 (diff) | |
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/dentry.c')
| -rw-r--r-- | fs/gfs2/dentry.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/dentry.c b/fs/gfs2/dentry.c index 30822b148f3e..5173b98ca036 100644 --- a/fs/gfs2/dentry.c +++ b/fs/gfs2/dentry.c @@ -117,7 +117,7 @@ static int gfs2_dentry_delete(const struct dentry *dentry) return 0; ginode = GFS2_I(d_inode(dentry)); - if (!ginode->i_iopen_gh.gh_gl) + if (!gfs2_holder_initialized(&ginode->i_iopen_gh)) return 0; if (test_bit(GLF_DEMOTE, &ginode->i_iopen_gh.gh_gl->gl_flags)) |