| author | Jeff Layton <jlayton@kernel.org> | 2019-05-07 13:20:54 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-25 16:26:49 (GMT) |
| commit | 304902e1f77dcd78bbe6f8fdaa1e68121e186f50 (patch) | |
| tree | e8ec3bfe137dc0243f298cc3127ad650eb2713c0 | |
| parent | 202494a960bd8f1ef74379f82087e0ea61e1390e (diff) | |
| download | common-304902e1f77dcd78bbe6f8fdaa1e68121e186f50.zip common-304902e1f77dcd78bbe6f8fdaa1e68121e186f50.tar.gz common-304902e1f77dcd78bbe6f8fdaa1e68121e186f50.tar.bz2 | |
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: 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>
| -rw-r--r-- | fs/ceph/super.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/ceph/super.c b/fs/ceph/super.c index 2a89030..c42cbd1 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c @@ -742,6 +742,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, @@ -750,6 +756,7 @@ static const struct super_operations ceph_super_ops = { .evict_inode = ceph_evict_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, |