[XFS] Fix some inconsistent types

SGI Modid: 2.5.x-xfs:slinx:155637a

fs/xfs/xfs_error.c

@@ -102,7 +102,7 @@ xfs_error_test(int error_tag, int *fsidp, char *expression,
 	if (random() % randfactor)
 		return 0;
 
-	memcpy(&fsid, fsidp, sizeof(fsid_t));
+	memcpy(&fsid, fsidp, sizeof(xfs_fsid_t));
 
 	for (i = 0; i < XFS_NUM_INJECT_ERROR; i++)  {
 		if (xfs_etest[i] == error_tag && xfs_etest_fsid[i] == fsid) {
@@ -123,7 +123,7 @@ xfs_errortag_add(int error_tag, xfs_mount_t *mp)
 	int len;
 	int64_t fsid;
 
-	memcpy(&fsid, mp->m_fixedfsid, sizeof(fsid_t));
+	memcpy(&fsid, mp->m_fixedfsid, sizeof(xfs_fsid_t));
 
 	for (i = 0; i < XFS_NUM_INJECT_ERROR; i++)  {
 		if (xfs_etest_fsid[i] == fsid && xfs_etest[i] == error_tag) {
@@ -156,7 +156,7 @@ xfs_errortag_clear(int error_tag, xfs_mount_t *mp)
 	int i;
 	int64_t fsid;
 
-	memcpy(&fsid, mp->m_fixedfsid, sizeof(fsid_t));
+	memcpy(&fsid, mp->m_fixedfsid, sizeof(xfs_fsid_t));
 
 	for (i = 0; i < XFS_NUM_INJECT_ERROR; i++) {
 		if (xfs_etest_fsid[i] == fsid && xfs_etest[i] == error_tag) {
@@ -209,7 +209,7 @@ xfs_errortag_clearall(xfs_mount_t *mp)
 {
 	int64_t fsid;
 
-	memcpy(&fsid, mp->m_fixedfsid, sizeof(fsid_t));
+	memcpy(&fsid, mp->m_fixedfsid, sizeof(xfs_fsid_t));
 
 	return xfs_errortag_clearall_umount(fsid, mp->m_fsname, 1);
 }

fs/xfs/xfs_mount.c

@@ -903,7 +903,7 @@ xfs_mountfs(
 	 *  File systems that don't support user level file handles (i.e.
 	 *  all of them except for XFS) will leave vfs_altfsid as NULL.
 	 */
-	vfsp->vfs_altfsid = (fsid_t *)mp->m_fixedfsid;
+	vfsp->vfs_altfsid = (xfs_fsid_t *)mp->m_fixedfsid;
 	mp->m_dmevmask = 0;	/* not persistent; set after each mount */
 
 	/*