mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 06:33:07 +00:00
Code Issues Releases Wiki Activity

ovl: Sync upper dirty data when syncing overlayfs

Browse source 
commit e8d4bfe3a7 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: Chengguang Xu <cgxu@mykernel.net>
Fixes: e593b2bf51 ("ovl: properly implement sync_filesystem()")
Cc: <stable@vger.kernel.org> #4.11
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chengguang Xu 2017-11-29 10:01:32 +08:00 committed by Greg Kroah-Hartman
parent 21b5b5e80b
commit 6aaaca7b81
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
fs/overlayfs/super.c
View file

@ -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;
}