Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve...

[firefly-linux-kernel-4.4.55.git] / fs / gfs2 / glops.c

diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index 0b527939c46fe0594f70308d711daf79efda9df4..fc1100781bbc1c954aebfd0d5a0ee317eb707012 100644 (file)
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -226,7 +226,7 @@ static void inode_go_sync(struct gfs2_glock *gl)
         * Writeback of the data mapping may cause the dirty flag to be set
         * so we have to clear it again here.
         */
-       smp_mb__before_clear_bit();
+       smp_mb__before_atomic();
        clear_bit(GLF_DIRTY, &gl->gl_flags);
 }