1 files changed, 6 insertions, 3 deletions

diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index cec89dd5d7d2..9153d2c77caf 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -53,6 +53,9 @@ xfs_fs_geometry(
         xfs_fsop_geom_t         *geo,
         int                     new_version)
 {
+
+        memset(geo, 0, sizeof(*geo));
+
         geo->blocksize = mp->m_sb.sb_blocksize;
         geo->rtextsize = mp->m_sb.sb_rextsize;
         geo->agblocks = mp->m_sb.sb_agblocks;
@@ -382,8 +385,8 @@ xfs_growfs_data_private(
                                   XFS_AGB_TO_DADDR(mp, agno, XFS_SB_BLOCK(mp)),
                                   XFS_FSS_TO_BB(mp, 1), 0, &bp);
                 if (error) {
-                        xfs_fs_cmn_err(CE_WARN, mp,
-                        "error %d reading secondary superblock for ag %d",
+                        xfs_warn(mp,
+                "error %d reading secondary superblock for ag %d",
                                 error, agno);
                         break;
                 }
@@ -396,7 +399,7 @@ xfs_growfs_data_private(
                 if (!(error = xfs_bwrite(mp, bp))) {
                         continue;
                 } else {
-                        xfs_fs_cmn_err(CE_WARN, mp,
+                        xfs_warn(mp,
                 "write error %d updating secondary superblock for ag %d",
                                 error, agno);
                         break; /* no point in continuing */