From: Brian Foster <bfoster@redhat.com>
To: Ian Kent <raven@themaw.net>
Cc: linux-xfs <linux-xfs@vger.kernel.org>,
Dave Chinner <dchinner@redhat.com>,
David Howells <dhowells@redhat.com>,
Al Viro <viro@zeniv.linux.org.uk>,
Eric Sandeen <sandeen@sandeen.net>
Subject: Re: [PATCH v2 09/15] xfs: mount-api - add xfs_remount_rw() helper
Date: Wed, 28 Aug 2019 09:27:34 -0400 [thread overview]
Message-ID: <20190828132734.GB16389@bfoster> (raw)
In-Reply-To: <156652200638.2607.17067626550015292418.stgit@fedora-28>
On Fri, Aug 23, 2019 at 09:00:06AM +0800, Ian Kent wrote:
> Factor the remount read write code into a helper to simplify the
> subsequent change from the super block method .remount_fs to the
> mount-api fs_context_operations method .reconfigure.
>
> Signed-off-by: Ian Kent <raven@themaw.net>
> ---
Seems fine:
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/xfs_super.c | 115 +++++++++++++++++++++++++++++-----------------------
> 1 file changed, 64 insertions(+), 51 deletions(-)
>
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index 7de64808eb00..9f7300958a38 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
> @@ -1341,6 +1341,68 @@ xfs_test_remount_options(
> return error;
> }
>
> +STATIC int
> +xfs_remount_rw(
> + struct xfs_mount *mp)
> +{
> + xfs_sb_t *sbp = &mp->m_sb;
> + int error;
> +
> + if (mp->m_flags & XFS_MOUNT_NORECOVERY) {
> + xfs_warn(mp,
> + "ro->rw transition prohibited on norecovery mount");
> + return -EINVAL;
> + }
> +
> + if (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5 &&
> + xfs_sb_has_ro_compat_feature(sbp, XFS_SB_FEAT_RO_COMPAT_UNKNOWN)) {
> + xfs_warn(mp,
> + "ro->rw transition prohibited on unknown (0x%x) ro-compat filesystem",
> + (sbp->sb_features_ro_compat &
> + XFS_SB_FEAT_RO_COMPAT_UNKNOWN));
> + return -EINVAL;
> + }
> +
> + mp->m_flags &= ~XFS_MOUNT_RDONLY;
> +
> + /*
> + * If this is the first remount to writeable state we
> + * might have some superblock changes to update.
> + */
> + if (mp->m_update_sb) {
> + error = xfs_sync_sb(mp, false);
> + if (error) {
> + xfs_warn(mp, "failed to write sb changes");
> + return error;
> + }
> + mp->m_update_sb = false;
> + }
> +
> + /*
> + * Fill out the reserve pool if it is empty. Use the stashed
> + * value if it is non-zero, otherwise go with the default.
> + */
> + xfs_restore_resvblks(mp);
> + xfs_log_work_queue(mp);
> +
> + /* Recover any CoW blocks that never got remapped. */
> + error = xfs_reflink_recover_cow(mp);
> + if (error) {
> + xfs_err(mp,
> + "Error %d recovering leftover CoW allocations.", error);
> + xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
> + return error;
> + }
> + xfs_start_block_reaping(mp);
> +
> + /* Create the per-AG metadata reservation pool .*/
> + error = xfs_fs_reserve_ag_blocks(mp);
> + if (error && error != -ENOSPC)
> + return error;
> +
> + return 0;
> +}
> +
> STATIC int
> xfs_fs_remount(
> struct super_block *sb,
> @@ -1404,57 +1466,8 @@ xfs_fs_remount(
>
> /* ro -> rw */
> if ((mp->m_flags & XFS_MOUNT_RDONLY) && !(*flags & SB_RDONLY)) {
> - if (mp->m_flags & XFS_MOUNT_NORECOVERY) {
> - xfs_warn(mp,
> - "ro->rw transition prohibited on norecovery mount");
> - return -EINVAL;
> - }
> -
> - if (XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5 &&
> - xfs_sb_has_ro_compat_feature(sbp,
> - XFS_SB_FEAT_RO_COMPAT_UNKNOWN)) {
> - xfs_warn(mp,
> -"ro->rw transition prohibited on unknown (0x%x) ro-compat filesystem",
> - (sbp->sb_features_ro_compat &
> - XFS_SB_FEAT_RO_COMPAT_UNKNOWN));
> - return -EINVAL;
> - }
> -
> - mp->m_flags &= ~XFS_MOUNT_RDONLY;
> -
> - /*
> - * If this is the first remount to writeable state we
> - * might have some superblock changes to update.
> - */
> - if (mp->m_update_sb) {
> - error = xfs_sync_sb(mp, false);
> - if (error) {
> - xfs_warn(mp, "failed to write sb changes");
> - return error;
> - }
> - mp->m_update_sb = false;
> - }
> -
> - /*
> - * Fill out the reserve pool if it is empty. Use the stashed
> - * value if it is non-zero, otherwise go with the default.
> - */
> - xfs_restore_resvblks(mp);
> - xfs_log_work_queue(mp);
> -
> - /* Recover any CoW blocks that never got remapped. */
> - error = xfs_reflink_recover_cow(mp);
> - if (error) {
> - xfs_err(mp,
> - "Error %d recovering leftover CoW allocations.", error);
> - xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
> - return error;
> - }
> - xfs_start_block_reaping(mp);
> -
> - /* Create the per-AG metadata reservation pool .*/
> - error = xfs_fs_reserve_ag_blocks(mp);
> - if (error && error != -ENOSPC)
> + error = xfs_remount_rw(mp);
> + if (error)
> return error;
> }
>
>
next prev parent reply other threads:[~2019-08-28 13:27 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-23 0:59 [PATCH v2 00/15] xfs: mount API patch series Ian Kent
2019-08-23 0:59 ` [PATCH v2 01/15] vfs: Create fs_context-aware mount_bdev() replacement Ian Kent
2019-08-23 0:59 ` [PATCH v2 02/15] xfs: mount-api - add fs parameter description Ian Kent
2019-08-27 12:39 ` Brian Foster
2019-08-30 10:31 ` Ian Kent
2019-08-30 11:56 ` Brian Foster
2019-09-17 3:13 ` Ian Kent
2019-09-17 12:10 ` Brian Foster
2019-09-18 3:43 ` Ian Kent
2019-09-18 3:49 ` Ian Kent
2019-08-23 0:59 ` [PATCH v2 03/15] xfs: mount-api - refactor suffix_kstrtoint() Ian Kent
2019-08-27 12:40 ` Brian Foster
2019-08-30 10:33 ` Ian Kent
2019-09-17 4:31 ` Ian Kent
2019-09-17 12:10 ` Brian Foster
2019-08-23 0:59 ` [PATCH v2 04/15] xfs: mount-api - refactor xfs_parseags() Ian Kent
2019-08-27 12:40 ` Brian Foster
2019-08-23 0:59 ` [PATCH v2 05/15] xfs: mount-api - make xfs_parse_param() take context .parse_param() args Ian Kent
2019-08-26 19:19 ` Eric Sandeen
2019-08-26 19:31 ` Eric Sandeen
2019-08-26 19:32 ` Eric Sandeen
2019-08-30 10:23 ` Ian Kent
2019-08-27 12:41 ` Brian Foster
2019-08-27 15:10 ` Darrick J. Wong
2019-08-27 15:15 ` Eric Sandeen
2019-08-28 0:55 ` Ian Kent
2019-08-30 10:51 ` Ian Kent
2019-08-23 0:59 ` [PATCH v2 06/15] xfs: mount-api - move xfs_parseargs() validation to a helper Ian Kent
2019-08-27 12:41 ` Brian Foster
2019-08-30 10:55 ` Ian Kent
2019-08-23 0:59 ` [PATCH v2 07/15] xfs: mount-api - refactor xfs_fs_fill_super() Ian Kent
2019-08-27 12:42 ` Brian Foster
2019-08-30 10:56 ` Ian Kent
2019-08-23 0:59 ` [PATCH v2 08/15] xfs: mount-api - add xfs_get_tree() Ian Kent
2019-08-28 13:27 ` Brian Foster
2019-08-30 11:01 ` Ian Kent
2019-08-23 1:00 ` [PATCH v2 09/15] xfs: mount-api - add xfs_remount_rw() helper Ian Kent
2019-08-28 13:27 ` Brian Foster [this message]
2019-08-23 1:00 ` [PATCH v2 10/15] xfs: mount-api - add xfs_remount_ro() helper Ian Kent
2019-08-28 13:27 ` Brian Foster
2019-08-23 1:00 ` [PATCH v2 11/15] xfs: mount api - add xfs_reconfigure() Ian Kent
2019-08-28 13:28 ` Brian Foster
2019-08-30 11:10 ` Ian Kent
2019-08-30 11:56 ` Brian Foster
2019-09-02 2:41 ` Ian Kent
2019-08-23 1:00 ` [PATCH v2 12/15] xfs: mount-api - add xfs_fc_free() Ian Kent
2019-08-28 13:28 ` Brian Foster
2019-08-30 11:19 ` Ian Kent
2019-08-30 11:20 ` Ian Kent
2019-08-23 1:00 ` [PATCH v2 13/15] xfs: mount-api - dont set sb in xfs_mount_alloc() Ian Kent
2019-08-28 13:28 ` Brian Foster
2019-08-23 1:00 ` [PATCH v2 14/15] xfs: mount-api - switch to new mount-api Ian Kent
2019-08-28 13:29 ` Brian Foster
2019-08-28 13:34 ` Eric Sandeen
2019-08-30 11:30 ` Ian Kent
2019-08-30 11:27 ` Ian Kent
2019-08-23 1:00 ` [PATCH v2 15/15] xfs: mount-api - remove legacy mount functions Ian Kent
2019-08-26 19:33 ` [PATCH v2 00/15] xfs: mount API patch series Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190828132734.GB16389@bfoster \
--to=bfoster@redhat.com \
--cc=dchinner@redhat.com \
--cc=dhowells@redhat.com \
--cc=linux-xfs@vger.kernel.org \
--cc=raven@themaw.net \
--cc=sandeen@sandeen.net \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).