Merge branch 'for-linus' of git://neil.brown.name/md

[pandora-kernel.git] / fs / gfs2 / super.c

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index f716c4f..71e4209 100644 (file)
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -1533,7 +1533,7 @@ static void gfs2_evict_inode(struct inode *inode)
 out_truncate:
        gfs2_log_flush(sdp, ip->i_gl);
        write_inode_now(inode, 1);
-       gfs2_ail_flush(ip->i_gl);
+       gfs2_ail_flush(ip->i_gl, 0);
 
        /* Case 2 starts here */
        error = gfs2_trans_begin(sdp, 0, sdp->sd_jdesc->jd_blocks);
@@ -1574,6 +1574,7 @@ static struct inode *gfs2_alloc_inode(struct super_block *sb)
        if (ip) {
                ip->i_flags = 0;
                ip->i_gl = NULL;
+               ip->i_rgd = NULL;
        }
        return &ip->i_inode;
 }