ceph: flush dirty inodes before proceeding with remount
commit 00abf69dd2
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: Jeff Layton <jlayton@kernel.org>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
202494a960
commit
304902e1f7
@ -742,6 +742,12 @@ static void ceph_umount_begin(struct super_block *sb)
|
|||||||
return;
|
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 = {
|
static const struct super_operations ceph_super_ops = {
|
||||||
.alloc_inode = ceph_alloc_inode,
|
.alloc_inode = ceph_alloc_inode,
|
||||||
.destroy_inode = ceph_destroy_inode,
|
.destroy_inode = ceph_destroy_inode,
|
||||||
@ -750,6 +756,7 @@ static const struct super_operations ceph_super_ops = {
|
|||||||
.evict_inode = ceph_evict_inode,
|
.evict_inode = ceph_evict_inode,
|
||||||
.sync_fs = ceph_sync_fs,
|
.sync_fs = ceph_sync_fs,
|
||||||
.put_super = ceph_put_super,
|
.put_super = ceph_put_super,
|
||||||
|
.remount_fs = ceph_remount,
|
||||||
.show_options = ceph_show_options,
|
.show_options = ceph_show_options,
|
||||||
.statfs = ceph_statfs,
|
.statfs = ceph_statfs,
|
||||||
.umount_begin = ceph_umount_begin,
|
.umount_begin = ceph_umount_begin,
|
||||||
|
Reference in New Issue
Block a user