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

diff --git a/fs/xfs/linux/xfs_aops.c b/fs/xfs/linux/xfs_aops.c
index 58ce0d4c4a9725cba02ac8c5bc811585deb4f290..6520a19a71cbd4002a7dfa85afae56be2c56292c 100644 (file)
--- a/fs/xfs/linux/xfs_aops.c
+++ b/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);

diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c
index 636e0b627cac4769c8f67c610eaa025369791a1f..76ffe4a8b4fe18bd24f98e18c50bcdaaaf9c26a8 100644 (file)
--- a/fs/xfs/xfs_ialloc.c
+++ b/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) >= "

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 0e2a54fa6e9bb30b48b8ccd6df4887cf3c2d69be..cbc6a10acc045216e556fc793965ee2f00fa4d3d 100644 (file)
--- a/fs/xfs/xfs_log_recover.c
+++ b/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);

diff --git a/fs/xfs/xfs_types.h b/fs/xfs/xfs_types.h
index 9a1b2737a32acf4fa896837ff2408549eef36bbb..9ba24c9e9dadb48732c46fdf82e062ca8b7400e2 100644 (file)
--- a/fs/xfs/xfs_types.h
+++ b/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__ */

diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index 557c4e27604df470528ec2f2bda4b85e7154d4d4..a9f48a25d50ad1f1730ff518aa8a37fe69e58567 100644 (file)
--- a/fs/xfs/xfs_vfsops.c
+++ b/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;