diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-06-10 07:32:41 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-06-10 07:32:41 +1000 |
| commit | 8612c7e594808e4a67bc2d4661f5925df2be3f51 (patch) | |
| tree | bf13dd921033fb4aaba8bd5ad309e933b6427ad8 /fs/xfs/xfs_mount.c | |
| parent | b70f14e1ffbb47369b1cc2cdf558c3468ae9e484 (diff) | |
| parent | 35f46c5f04cc7c45ce59d3ba4c28ba138184414b (diff) | |
Merge branch 'xfs-da-geom' into for-next
Diffstat (limited to 'fs/xfs/xfs_mount.c')
| -rw-r--r-- | fs/xfs/xfs_mount.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 3f097825eff..03c9d645865 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c @@ -780,12 +780,11 @@ xfs_mountfs( mp->m_dmevmask = 0; /* not persistent; set after each mount */ - xfs_dir_mount(mp); - - /* - * Initialize the attribute manager's entries. - */ - mp->m_attr_magicpct = (mp->m_sb.sb_blocksize * 37) / 100; + error = xfs_da_mount(mp); + if (error) { + xfs_warn(mp, "Failed dir/attr init: %d", error); + goto out_remove_uuid; + } /* * Initialize the precomputed transaction reservations values. @@ -800,7 +799,7 @@ xfs_mountfs( error = xfs_initialize_perag(mp, sbp->sb_agcount, &mp->m_maxagi); if (error) { xfs_warn(mp, "Failed per-ag init: %d", error); - goto out_remove_uuid; + goto out_free_dir; } if (!sbp->sb_logblocks) { @@ -975,6 +974,8 @@ xfs_mountfs( xfs_wait_buftarg(mp->m_ddev_targp); out_free_perag: xfs_free_perag(mp); + out_free_dir: + xfs_da_unmount(mp); out_remove_uuid: xfs_uuid_unmount(mp); out: @@ -1052,6 +1053,7 @@ xfs_unmountfs( "Freespace may not be correct on next mount."); xfs_log_unmount(mp); + xfs_da_unmount(mp); xfs_uuid_unmount(mp); #if defined(DEBUG) |