Merge branch 'pm-sleep'

[cascardo/linux.git] / fs / xfs / xfs_super.c

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 9f80909..24ef83e 100644 (file)
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1574,6 +1574,10 @@ xfs_fs_fill_super(
                }
        }
 
+       if (xfs_sb_version_hasrmapbt(&mp->m_sb))
+               xfs_alert(mp,
+       "EXPERIMENTAL reverse mapping btree feature enabled. Use at your own risk!");
+
        error = xfs_mountfs(mp);
        if (error)
                goto out_filestream_unmount;
@@ -1766,9 +1770,7 @@ xfs_init_zones(void)
        if (!xfs_icreate_zone)
                goto out_destroy_ili_zone;
 
-       xfs_rud_zone = kmem_zone_init((sizeof(struct xfs_rud_log_item) +
-                       ((XFS_RUD_MAX_FAST_EXTENTS - 1) *
-                                sizeof(struct xfs_map_extent))),
+       xfs_rud_zone = kmem_zone_init(sizeof(struct xfs_rud_log_item),
                        "xfs_rud_item");
        if (!xfs_rud_zone)
                goto out_destroy_icreate_zone;