xfs: minor cleanups

These come from syncing the shared userspace and kernel code. Small
whitespace and trivial cleanups.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>

4 files changed, 4 insertions, 14 deletions

diff --git a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/xfs_attr_leaf.c
index fe0ade9a74ba..4dba2f9455f4 100644
--- a/fs/xfs/xfs_attr_leaf.c
+++ b/fs/xfs/xfs_attr_leaf.c
@@ -936,7 +936,6 @@ out:
         return error;
 }
 
-
 /*========================================================================
  * Routines used for growing the Btree.
  *========================================================================*/
@@ -1297,7 +1296,6 @@ xfs_attr3_leaf_compact(
         ichdr_dst->freemap[0].size = ichdr_dst->firstused -
                                                 ichdr_dst->freemap[0].base;
 
-
         /* write the header back to initialise the underlying buffer */
         xfs_attr3_leaf_hdr_to_disk(leaf_dst, ichdr_dst);
 
diff --git a/fs/xfs/xfs_attr_remote.c b/fs/xfs/xfs_attr_remote.c
index 13a0ed9cb40a..b42926a5400d 100644
--- a/fs/xfs/xfs_attr_remote.c
+++ b/fs/xfs/xfs_attr_remote.c
@@ -251,7 +251,7 @@ xfs_attr_rmtval_copyout(
                 int hdr_size = 0;
                 int byte_cnt = XFS_ATTR3_RMT_BUF_SPACE(mp, XFS_LBSIZE(mp));
 
-                byte_cnt = min_t(int, *valuelen, byte_cnt);
+                byte_cnt = min(*valuelen, byte_cnt);
 
                 if (xfs_sb_version_hascrc(&mp->m_sb)) {
                         if (!xfs_attr3_rmt_hdr_ok(mp, src, ino, *offset,
@@ -545,11 +545,6 @@ xfs_attr_rmtval_remove(
 
         /*
          * Roll through the "value", invalidating the attribute value's blocks.
-         * Note that args->rmtblkcnt is the minimum number of data blocks we'll
-         * see for a CRC enabled remote attribute. Each extent will have a
-         * header, and so we may have more blocks than we realise here.  If we
-         * fail to map the blocks correctly, we'll have problems with the buffer
-         * lookups.
          */
         lblkno = args->rmtblkno;
         blkcnt = args->rmtblkcnt;
@@ -630,4 +625,3 @@ xfs_attr_rmtval_remove(
         }
         return(0);
 }
-
diff --git a/fs/xfs/xfs_bmap_btree.c b/fs/xfs/xfs_bmap_btree.c
index bcee383b23b6..cf3bc76710c3 100644
--- a/fs/xfs/xfs_bmap_btree.c
+++ b/fs/xfs/xfs_bmap_btree.c
@@ -722,7 +722,7 @@ xfs_bmbt_key_diff(
                                       cur->bc_rec.b.br_startoff;
 }
 
-static int
+static bool
 xfs_bmbt_verify(
         struct xfs_buf          *bp)
 {
@@ -775,7 +775,6 @@ xfs_bmbt_verify(
                 return false;
 
         return true;
-
 }
 
 static void
@@ -789,7 +788,6 @@ xfs_bmbt_read_verify(
                                      bp->b_target->bt_mount, bp->b_addr);
                 xfs_buf_ioerror(bp, EFSCORRUPTED);
         }
-
 }
 
 static void
diff --git a/fs/xfs/xfs_inode_fork.c b/fs/xfs/xfs_inode_fork.c
index 8b8ba0234371..f06570bb36bd 100644
--- a/fs/xfs/xfs_inode_fork.c
+++ b/fs/xfs/xfs_inode_fork.c
@@ -780,8 +780,8 @@ xfs_iextents_copy(
                 }
 
                 /* Translate to on disk format */
-                put_unaligned(cpu_to_be64(ep->l0), &dp->l0);
-                put_unaligned(cpu_to_be64(ep->l1), &dp->l1);
+                put_unaligned_be64(ep->l0, &dp->l0);
+                put_unaligned_be64(ep->l1, &dp->l1);
                 dp++;
                 copied++;
         }