diff options
author | Andreas Gruenbacher <agruenba@redhat.com> | 2015-10-29 11:58:09 -0400 |
---|---|---|
committer | Bob Peterson <rpeterso@redhat.com> | 2015-10-29 13:57:48 -0400 |
commit | f3dd1649122b9e73f869e5304d5fa8554e128b7a (patch) | |
tree | d6e75c45ea5250f7dc483c51b08cd1b78f40fa1d /fs/gfs2/glops.c | |
parent | 491e94f790982bec5a1334dd3db2708de3724bdf (diff) |
gfs2: Remove gl_spin define
Commit e66cf161 replaced the gl_spin spinlock in struct gfs2_glock with a
gl_lockref lockref and defined gl_spin as gl_lockref.lock (the spinlock in
gl_lockref). Remove that define to make the references to gl_lockref.lock more
obvious.
Signed-off-by: Andreas Gruenbacher <andreas.gruenbacher@gmail.com>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Diffstat (limited to 'fs/gfs2/glops.c')
-rw-r--r-- | fs/gfs2/glops.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c index 1f6c9c3fe5cb..f348cfb6b69a 100644 --- a/fs/gfs2/glops.c +++ b/fs/gfs2/glops.c | |||
@@ -146,11 +146,11 @@ static void rgrp_go_sync(struct gfs2_glock *gl) | |||
146 | struct gfs2_rgrpd *rgd; | 146 | struct gfs2_rgrpd *rgd; |
147 | int error; | 147 | int error; |
148 | 148 | ||
149 | spin_lock(&gl->gl_spin); | 149 | spin_lock(&gl->gl_lockref.lock); |
150 | rgd = gl->gl_object; | 150 | rgd = gl->gl_object; |
151 | if (rgd) | 151 | if (rgd) |
152 | gfs2_rgrp_brelse(rgd); | 152 | gfs2_rgrp_brelse(rgd); |
153 | spin_unlock(&gl->gl_spin); | 153 | spin_unlock(&gl->gl_lockref.lock); |
154 | 154 | ||
155 | if (!test_and_clear_bit(GLF_DIRTY, &gl->gl_flags)) | 155 | if (!test_and_clear_bit(GLF_DIRTY, &gl->gl_flags)) |
156 | return; | 156 | return; |
@@ -162,11 +162,11 @@ static void rgrp_go_sync(struct gfs2_glock *gl) | |||
162 | mapping_set_error(mapping, error); | 162 | mapping_set_error(mapping, error); |
163 | gfs2_ail_empty_gl(gl); | 163 | gfs2_ail_empty_gl(gl); |
164 | 164 | ||
165 | spin_lock(&gl->gl_spin); | 165 | spin_lock(&gl->gl_lockref.lock); |
166 | rgd = gl->gl_object; | 166 | rgd = gl->gl_object; |
167 | if (rgd) | 167 | if (rgd) |
168 | gfs2_free_clones(rgd); | 168 | gfs2_free_clones(rgd); |
169 | spin_unlock(&gl->gl_spin); | 169 | spin_unlock(&gl->gl_lockref.lock); |
170 | } | 170 | } |
171 | 171 | ||
172 | /** | 172 | /** |
@@ -542,7 +542,7 @@ static int freeze_go_demote_ok(const struct gfs2_glock *gl) | |||
542 | * iopen_go_callback - schedule the dcache entry for the inode to be deleted | 542 | * iopen_go_callback - schedule the dcache entry for the inode to be deleted |
543 | * @gl: the glock | 543 | * @gl: the glock |
544 | * | 544 | * |
545 | * gl_spin lock is held while calling this | 545 | * gl_lockref.lock lock is held while calling this |
546 | */ | 546 | */ |
547 | static void iopen_go_callback(struct gfs2_glock *gl, bool remote) | 547 | static void iopen_go_callback(struct gfs2_glock *gl, bool remote) |
548 | { | 548 | { |