diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2017-06-30 07:55:08 -0500 |
|---|---|---|
| committer | Bob Peterson <rpeterso@redhat.com> | 2017-07-05 07:20:52 -0500 |
| commit | 6f6597baae206c544c49ad7f1129d5adc1e9019d (patch) | |
| tree | 3bcfcb1ebf6713cdd95f4146012c236e3d6f5fbf /fs/gfs2/super.c | |
| parent | 4fd1a5795214bc6405f14691c1344ae8c3f17215 (diff) | |
| download | linux-6f6597baae206c544c49ad7f1129d5adc1e9019d.tar.gz | |
gfs2: Protect gl->gl_object by spin lock
Put all remaining accesses to gl->gl_object under the
gl->gl_lockref.lock spinlock to prevent races.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Diffstat (limited to 'fs/gfs2/super.c')
| -rw-r--r-- | fs/gfs2/super.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 7d12c1232c428..bd5ad6c5514e3 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -1105,9 +1105,12 @@ static int gfs2_statfs_slow(struct gfs2_sbd *sdp, struct gfs2_statfs_change_host gfs2_holder_uninit(gh); error = err; } else { - if (!error) - error = statfs_slow_fill( - gh->gh_gl->gl_object, sc); + if (!error) { + struct gfs2_rgrpd *rgd = + gfs2_glock2rgrp(gh->gh_gl); + + error = statfs_slow_fill(rgd, sc); + } gfs2_glock_dq_uninit(gh); } } @@ -1637,7 +1640,7 @@ out: gfs2_glock_put(ip->i_gl); ip->i_gl = NULL; if (gfs2_holder_initialized(&ip->i_iopen_gh)) { - ip->i_iopen_gh.gh_gl->gl_object = NULL; + glock_set_object(ip->i_iopen_gh.gh_gl, NULL); ip->i_iopen_gh.gh_flags |= GL_NOCACHE; gfs2_glock_dq_uninit(&ip->i_iopen_gh); } |