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

Commit 77ca9144 authored by Jeff Layton's avatar Jeff Layton Committed by Greg Kroah-Hartman
Browse files

ceph: flush dirty inodes before proceeding with remount 

commit 00abf69dd24f4444d185982379c5cc3bb7b6d1fc upstream.

xfstest generic/452 was triggering a "Busy inodes after umount" warning.
ceph was allowing the mount to go read-only without first flushing out
dirty inodes in the cache. Ensure we sync out the filesystem before
allowing a remount to proceed.

Cc: stable@vger.kernel.org
Link: http://tracker.ceph.com/issues/39571


Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatar"Yan, Zheng" <zyan@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b18339bc

fs/ceph/super.c

+7 −0
Original line number Diff line number Diff line
@@ -819,6 +819,12 @@ static void ceph_umount_begin(struct super_block *sb) 
	return;

}



static int ceph_remount(struct super_block *sb, int *flags, char *data)

{

	sync_filesystem(sb);

	return 0;

}



static const struct super_operations ceph_super_ops = {

	.alloc_inode	= ceph_alloc_inode,

	.destroy_inode	= ceph_destroy_inode,
@@ -826,6 +832,7 @@ static const struct super_operations ceph_super_ops = { 
	.drop_inode	= ceph_drop_inode,

	.sync_fs        = ceph_sync_fs,

	.put_super	= ceph_put_super,

	.remount_fs	= ceph_remount,

	.show_options   = ceph_show_options,

	.statfs		= ceph_statfs,

	.umount_begin   = ceph_umount_begin,