lkml.org 
[lkml]   [2019]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 049/209] xfs: require both realtime inodes to mount
    Date
    From: Darrick J. Wong <darrick.wong@oracle.com>

    [ Upstream commit 64bafd2f1e484e27071e7584642005d56516cb77 ]

    Since mkfs always formats the filesystem with the realtime bitmap and
    summary inodes immediately after the root directory, we should expect
    that both of them are present and loadable, even if there isn't a
    realtime volume attached. There's no reason to skip this if rbmino ==
    NULLFSINO; in fact, this causes an immediate crash if the there /is/ a
    realtime volume and someone writes to it.

    Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
    Reviewed-by: Bill O'Donnell <billodo@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/xfs/xfs_rtalloc.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
    index 488719d43ca82..cdcb7235e41ae 100644
    --- a/fs/xfs/xfs_rtalloc.c
    +++ b/fs/xfs/xfs_rtalloc.c
    @@ -1214,13 +1214,11 @@ xfs_rtmount_inodes(
    xfs_sb_t *sbp;

    sbp = &mp->m_sb;
    - if (sbp->sb_rbmino == NULLFSINO)
    - return 0;
    error = xfs_iget(mp, NULL, sbp->sb_rbmino, 0, 0, &mp->m_rbmip);
    if (error)
    return error;
    ASSERT(mp->m_rbmip != NULL);
    - ASSERT(sbp->sb_rsumino != NULLFSINO);
    +
    error = xfs_iget(mp, NULL, sbp->sb_rsumino, 0, 0, &mp->m_rsumip);
    if (error) {
    IRELE(mp->m_rbmip);
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-04 19:23    [W:4.582 / U:0.340 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site