From f7fe4074dde1c516df50663495b1d3516ccbb33a Mon Sep 17 00:00:00 2001 From: syphyr Date: Sat, 13 Jul 2019 21:04:31 +0200 Subject: [PATCH] ANDROID: sdcardfs: Wait for file flush to complete Sdcardfs needs to wait for the file to finish writing before returning an error. Backport from 3.18 to 3.10 kernel. --- fs/sdcardfs/file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/sdcardfs/file.c b/fs/sdcardfs/file.c index 23e44a713aa8..3d15a2271e26 100644 --- a/fs/sdcardfs/file.c +++ b/fs/sdcardfs/file.c @@ -297,8 +297,10 @@ static int sdcardfs_flush(struct file *file, fl_owner_t id) struct file *lower_file = NULL; lower_file = sdcardfs_lower_file(file); - if (lower_file && lower_file->f_op && lower_file->f_op->flush) + if (lower_file && lower_file->f_op && lower_file->f_op->flush) { + filemap_write_and_wait(file->f_mapping); err = lower_file->f_op->flush(lower_file, id); + } return err; }