Merge branch 'master'

1 files changed, 4 insertions, 1 deletions

diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index 66cbee79864e..668ad23fd37c 100644
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -510,9 +510,12 @@ xfs_preferred_iosize(xfs_mount_t *mp)
  */
 #define XFS_MFSI_SECOND         0x01    /* Secondary mount -- skip stuff */
 #define XFS_MFSI_CLIENT         0x02    /* Is a client -- skip lots of stuff */
+/*      XFS_MFSI_RRINODES       */
 #define XFS_MFSI_NOUNLINK       0x08    /* Skip unlinked inode processing in */
                                         /* log recovery */
 #define XFS_MFSI_NO_QUOTACHECK  0x10    /* Skip quotacheck processing */
+/*      XFS_MFSI_CONVERT_SUNIT  */
+#define XFS_MFSI_QUIET          0x40    /* Be silent if mount errors found */
 
 /*
  * Macros for getting from mount to vfs and back.
@@ -581,7 +584,7 @@ extern int	xfs_mod_incore_sb_unlocked(xfs_mount_t *, xfs_sb_field_t,
 extern int      xfs_mod_incore_sb_batch(xfs_mount_t *, xfs_mod_sb_t *,
                         uint, int);
 extern struct xfs_buf *xfs_getsb(xfs_mount_t *, int);
-extern int      xfs_readsb(xfs_mount_t *mp);
+extern int      xfs_readsb(xfs_mount_t *, int);
 extern void     xfs_freesb(xfs_mount_t *);
 extern void     xfs_do_force_shutdown(bhv_desc_t *, int, char *, int);
 extern int      xfs_syncsub(xfs_mount_t *, int, int, int *);