[XFS] Match up minor formatting changes between SGI and Linus trees

fs/xfs/linux/xfs_aops.c

@@ -984,8 +984,7 @@ linvfs_direct_IO(
 	if (error)
 		return -error;
 
-        return blockdev_direct_IO(rw, iocb, inode,
-		pbmap.pbm_target->pbr_bdev,
+        return blockdev_direct_IO(rw, iocb, inode, pbmap.pbm_target->pbr_bdev,
 		iov, offset, nr_segs,
 		linvfs_get_blocks_direct,
 		linvfs_unwritten_convert_direct);

fs/xfs/xfs_ialloc.c

@@ -1163,7 +1163,7 @@ xfs_dilocate(
 	agbno = XFS_AGINO_TO_AGBNO(mp, agino);
 	if (agno >= mp->m_sb.sb_agcount || agbno >= mp->m_sb.sb_agblocks ||
 	    ino != XFS_AGINO_TO_INO(mp, agno, agino)) {
-#if 0
+#ifdef DEBUG
 		if (agno >= mp->m_sb.sb_agcount) {
 			xfs_fs_cmn_err(CE_ALERT, mp,
 					"xfs_dilocate: agno (%d) >= "

fs/xfs/xfs_log_recover.c

@@ -2039,7 +2039,7 @@ xfs_qm_dqcheck(
 	if (id != -1 && id != INT_GET(ddq->d_id, ARCH_CONVERT)) {
 		if (flags & XFS_QMOPT_DOWARN)
 			cmn_err(CE_ALERT,
-			"%s : ondisk-dquot 0x%x, ID mismatch: "
+			"%s : ondisk-dquot 0x%p, ID mismatch: "
 			"0x%x expected, found id 0x%x",
 			str, ddq, id, INT_GET(ddq->d_id, ARCH_CONVERT));
 		errs++;
@@ -2053,7 +2053,7 @@ xfs_qm_dqcheck(
 			    !INT_ISZERO(ddq->d_id, ARCH_CONVERT)) {
 				if (flags & XFS_QMOPT_DOWARN)
 					cmn_err(CE_ALERT,
-					"%s : Dquot ID 0x%x (0x%x) "
+					"%s : Dquot ID 0x%x (0x%p) "
 					"BLK TIMER NOT STARTED",
 					str, (int)
 					INT_GET(ddq->d_id, ARCH_CONVERT), ddq);
@@ -2067,7 +2067,7 @@ xfs_qm_dqcheck(
 			    !INT_ISZERO(ddq->d_id, ARCH_CONVERT)) {
 				if (flags & XFS_QMOPT_DOWARN)
 					cmn_err(CE_ALERT,
-					"%s : Dquot ID 0x%x (0x%x) "
+					"%s : Dquot ID 0x%x (0x%p) "
 					"INODE TIMER NOT STARTED",
 					str, (int)
 					INT_GET(ddq->d_id, ARCH_CONVERT), ddq);

fs/xfs/xfs_types.h

@@ -75,8 +75,6 @@ typedef __uint64_t __psunsigned_t;
 #error BITS_PER_LONG must be 32 or 64
 #endif
 
-#endif	/* __KERNEL__ */
-
 /*
  * Some types are conditional depending on the target system.
  * XFS_BIG_BLKNOS needs block layer disk addresses to be 64 bits.
@@ -95,6 +93,8 @@ typedef __uint64_t __psunsigned_t;
 # define XFS_BIG_INUMS	0
 #endif
 
+#endif	/* __KERNEL__ */
+
 typedef __uint32_t	xfs_agblock_t;	/* blockno in alloc. group */
 typedef	__uint32_t	xfs_extlen_t;	/* extent length in blocks */
 typedef	__uint32_t	xfs_agnumber_t;	/* allocation group number */
@@ -197,4 +197,4 @@ typedef enum {
 	XFS_BTNUM_MAX
 } xfs_btnum_t;
 
-#endif	/* !__XFS_TYPES_H */
+#endif	/* __XFS_TYPES_H__ */

fs/xfs/xfs_vfsops.c

@@ -225,7 +225,7 @@ xfs_start_flags(
 		/*
 		 * At this point the superblock has not been read
 		 * in, therefore we do not know the block size.
-		 * Before, the mount call ends we will convert
+		 * Before the mount call ends we will convert
 		 * these to FSBs.
 		 */
 		mp->m_dalign = ap->sunit;