Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[~andy/linux] / fs / affs / super.c

diff --git a/fs/affs/super.c b/fs/affs/super.c
index 966c8c06b9b3a2653c7b7130607614a236ed457d..1f030825cd3a3f5cb77b5f938efb70a6bd6a018c 100644 (file)
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -555,7 +555,7 @@ affs_remount(struct super_block *sb, int *flags, char *data)
                return -EINVAL;
        }
 
-       flush_delayed_work_sync(&sbi->sb_work);
+       flush_delayed_work(&sbi->sb_work);
        replace_mount_options(sb, new_opts);
 
        sbi->s_flags = mount_flags;