Commit:     b524fe646c9a226a847e30ca1221dc22e952f16b
Parent:     7dcca30a32aadb0520417521b0c44f42d09fe05c
Author:     Benjamin Marzinski <[EMAIL PROTECTED]>
AuthorDate: Wed May 2 09:44:03 2007 -0500
Committer:  Steven Whitehouse <[EMAIL PROTECTED]>
CommitDate: Mon Jul 9 08:22:07 2007 +0100

    [GFS2] flush the glock completely in inode_go_sync
    Fix for bz #231910
    When filemap_fdatawrite() is called on the inode mapping in data=ordered 
    it will add the glock to the log. In inode_go_sync(), if you do the
    gfs2_log_flush() before this, after the filemap_fdatawrite() call, the glock
    and its associated data buffers will be on the log again. This means you can
    demote a lock from exclusive, without having it flushed from the log. The
    attached patch simply moves the gfs2_log_flush up to after the
    filemap_fdatawrite() call.
    Originally, I tried moving the gfs2_log_flush to after gfs2_meta_sync(), but
    that caused me to trip the following assert.
    GFS2: fsid=cypher-36:test.0: fatal: assertion "!buffer_busy(bh)" failed
    GFS2: fsid=cypher-36:test.0:   function = gfs2_ail_empty_gl, file = 
fs/gfs2/glops.c, line = 61
    It appears that gfs2_log_flush() puts some of the glocks buffers in the busy
    state and the filemap_fdatawrite() call is necessary to flush them. This 
    me worry slightly that a related problem could happen because of moving the
    gfs2_log_flush() after the initial filemap_fdatawrite(), but I assume that
    gfs2_ail_empty_gl() would catch that case as well.
    Signed-off-by: Benjamin E. Marzinski <[EMAIL PROTECTED]>
    Signed-off-by: Steven Whitehouse <[EMAIL PROTECTED]>
 fs/gfs2/glops.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index 7b82657..777ca46 100644
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -156,9 +156,9 @@ static void inode_go_sync(struct gfs2_glock *gl)
                ip = NULL;
        if (test_bit(GLF_DIRTY, &gl->gl_flags)) {
-               gfs2_log_flush(gl->gl_sbd, gl);
                if (ip)
+               gfs2_log_flush(gl->gl_sbd, gl);
                if (ip) {
                        struct address_space *mapping = ip->i_inode.i_mapping;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to