drm/i915/dsi: remove intel_dsi_cmd.c and the unused functions therein

[firefly-linux-kernel-4.4.55.git] / fs / nilfs2 / super.c

diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index 228f5bdf07721dabae68349461eb1f24f99a2f33..2e5b3ec85b8f62c967e785697449c773fe0e1337 100644 (file)
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -310,6 +310,9 @@ int nilfs_commit_super(struct super_block *sb, int flag)
                                            nilfs->ns_sbsize));
        }
        clear_nilfs_sb_dirty(nilfs);
+       nilfs->ns_flushed_device = 1;
+       /* make sure store to ns_flushed_device cannot be reordered */
+       smp_wmb();
        return nilfs_sync_super(sb, flag);
 }
 
@@ -514,6 +517,9 @@ static int nilfs_sync_fs(struct super_block *sb, int wait)
        }
        up_write(&nilfs->ns_sem);
 
+       if (!err)
+               err = nilfs_flush_device(nilfs);
+
        return err;
 }