Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6aaaca7b authored by Chengguang Xu's avatar Chengguang Xu Committed by Greg Kroah-Hartman
Browse files

ovl: Sync upper dirty data when syncing overlayfs 



commit e8d4bfe3a71537284a90561f77c85dea6c154369 upstream.

When executing filesystem sync or umount on overlayfs,
dirty data does not get synced as expected on upper filesystem.
This patch fixes sync filesystem method to keep data consistency
for overlayfs.

Signed-off-by: default avatarChengguang Xu <cgxu@mykernel.net>
Fixes: e593b2bf ("ovl: properly implement sync_filesystem()")
Cc: <stable@vger.kernel.org> #4.11
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Signed-off-by: default avatarSudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 21b5b5e8

fs/overlayfs/super.c

+15 −4
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ static void ovl_put_super(struct super_block *sb) 
	kfree(ufs);

}



/* Sync real dirty inodes in upper filesystem (if it exists) */

static int ovl_sync_fs(struct super_block *sb, int wait)

{

	struct ovl_fs *ufs = sb->s_fs_info;
@@ -240,14 +241,24 @@ static int ovl_sync_fs(struct super_block *sb, int wait) 


	if (!ufs->upper_mnt)

		return 0;

	upper_sb = ufs->upper_mnt->mnt_sb;

	if (!upper_sb->s_op->sync_fs)



	/*

	 * If this is a sync(2) call or an emergency sync, all the super blocks

	 * will be iterated, including upper_sb, so no need to do anything.

	 *

	 * If this is a syncfs(2) call, then we do need to call

	 * sync_filesystem() on upper_sb, but enough if we do it when being

	 * called with wait == 1.

	 */

	if (!wait)

		return 0;



	/* real inodes have already been synced by sync_filesystem(ovl_sb) */

	upper_sb = ufs->upper_mnt->mnt_sb;



	down_read(&upper_sb->s_umount);

	ret = upper_sb->s_op->sync_fs(upper_sb, wait);

	ret = sync_filesystem(upper_sb);

	up_read(&upper_sb->s_umount);



	return ret;

}