diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2007-08-16 16:03:57 +0100 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2007-10-10 08:55:29 +0100 |
| commit | bb3b0e3df5420fdf2c6bbb4417525c6d2ef55bbb (patch) | |
| tree | 6eab0fa06b4dc9f9a8d62cedaa6879327966a20c /fs/gfs2/glops.c | |
| parent | 2d9a4bbf6d28673f4057682cc02d16bf288b4a35 (diff) | |
[GFS2] Clean up invalidatepage/releasepage
This patch fixes some bugs relating to journaled data files by cleaning
up the gfs2_invalidatepage() and gfs2_releasepage() functions. We now
never block during gfs2_releasepage(), instead we always either release
or refuse to release depending on the status of the buffers.
This fixes Red Hat bugzillas #248969 and #252392.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Cc: Bob Peterson <rpeterso@redhat.com>
Diffstat (limited to 'fs/gfs2/glops.c')
| -rw-r--r-- | fs/gfs2/glops.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c index 777ca46010e..88342e0b4bc 100644 --- a/fs/gfs2/glops.c +++ b/fs/gfs2/glops.c @@ -156,9 +156,11 @@ static void inode_go_sync(struct gfs2_glock *gl) ip = NULL; if (test_bit(GLF_DIRTY, &gl->gl_flags)) { - if (ip) + if (ip && !gfs2_is_jdata(ip)) filemap_fdatawrite(ip->i_inode.i_mapping); gfs2_log_flush(gl->gl_sbd, gl); + if (ip && gfs2_is_jdata(ip)) + filemap_fdatawrite(ip->i_inode.i_mapping); gfs2_meta_sync(gl); if (ip) { struct address_space *mapping = ip->i_inode.i_mapping; |