Merge tag 'ftracetest-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[mirror_ubuntu-zesty-kernel.git] / fs / gfs2 / quota.c

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index c4effff7cf559c701e890e804cef81dfb1cac30e..64b29f7f6b4ce7ab8a7b0f5bb75430d80515ae15 100644 (file)
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -778,6 +778,7 @@ get_a_page:
                i_size_write(inode, size);
        inode->i_mtime = inode->i_atime = CURRENT_TIME;
        mark_inode_dirty(inode);
+       set_bit(QDF_REFRESH, &qd->qd_flags);
        return 0;
 
 unlock_out:
@@ -879,7 +880,7 @@ out:
                gfs2_glock_dq_uninit(&ghs[qx]);
        mutex_unlock(&ip->i_inode.i_mutex);
        kfree(ghs);
-       gfs2_log_flush(ip->i_gl->gl_sbd, ip->i_gl);
+       gfs2_log_flush(ip->i_gl->gl_sbd, ip->i_gl, NORMAL_FLUSH);
        return error;
 }