Commit c5c249b4 authored by Dave Chinner's avatar Dave Chinner Committed by Ben Myers

xfs: minor cleanups

These come from syncing the shared userspace and kernel code. Small
whitespace and trivial cleanups.
Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarMark Tinguely <tinguely@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 68988114
...@@ -936,7 +936,6 @@ xfs_attr3_leaf_to_node( ...@@ -936,7 +936,6 @@ xfs_attr3_leaf_to_node(
return error; return error;
} }
/*======================================================================== /*========================================================================
* Routines used for growing the Btree. * Routines used for growing the Btree.
*========================================================================*/ *========================================================================*/
...@@ -1297,7 +1296,6 @@ xfs_attr3_leaf_compact( ...@@ -1297,7 +1296,6 @@ xfs_attr3_leaf_compact(
ichdr_dst->freemap[0].size = ichdr_dst->firstused - ichdr_dst->freemap[0].size = ichdr_dst->firstused -
ichdr_dst->freemap[0].base; ichdr_dst->freemap[0].base;
/* write the header back to initialise the underlying buffer */ /* write the header back to initialise the underlying buffer */
xfs_attr3_leaf_hdr_to_disk(leaf_dst, ichdr_dst); xfs_attr3_leaf_hdr_to_disk(leaf_dst, ichdr_dst);
......
...@@ -251,7 +251,7 @@ xfs_attr_rmtval_copyout( ...@@ -251,7 +251,7 @@ xfs_attr_rmtval_copyout(
int hdr_size = 0; int hdr_size = 0;
int byte_cnt = XFS_ATTR3_RMT_BUF_SPACE(mp, XFS_LBSIZE(mp)); 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_sb_version_hascrc(&mp->m_sb)) {
if (!xfs_attr3_rmt_hdr_ok(mp, src, ino, *offset, if (!xfs_attr3_rmt_hdr_ok(mp, src, ino, *offset,
...@@ -545,11 +545,6 @@ xfs_attr_rmtval_remove( ...@@ -545,11 +545,6 @@ xfs_attr_rmtval_remove(
/* /*
* Roll through the "value", invalidating the attribute value's blocks. * 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; lblkno = args->rmtblkno;
blkcnt = args->rmtblkcnt; blkcnt = args->rmtblkcnt;
...@@ -630,4 +625,3 @@ xfs_attr_rmtval_remove( ...@@ -630,4 +625,3 @@ xfs_attr_rmtval_remove(
} }
return(0); return(0);
} }
...@@ -722,7 +722,7 @@ xfs_bmbt_key_diff( ...@@ -722,7 +722,7 @@ xfs_bmbt_key_diff(
cur->bc_rec.b.br_startoff; cur->bc_rec.b.br_startoff;
} }
static int static bool
xfs_bmbt_verify( xfs_bmbt_verify(
struct xfs_buf *bp) struct xfs_buf *bp)
{ {
...@@ -775,7 +775,6 @@ xfs_bmbt_verify( ...@@ -775,7 +775,6 @@ xfs_bmbt_verify(
return false; return false;
return true; return true;
} }
static void static void
...@@ -789,7 +788,6 @@ xfs_bmbt_read_verify( ...@@ -789,7 +788,6 @@ xfs_bmbt_read_verify(
bp->b_target->bt_mount, bp->b_addr); bp->b_target->bt_mount, bp->b_addr);
xfs_buf_ioerror(bp, EFSCORRUPTED); xfs_buf_ioerror(bp, EFSCORRUPTED);
} }
} }
static void static void
......
...@@ -780,8 +780,8 @@ xfs_iextents_copy( ...@@ -780,8 +780,8 @@ xfs_iextents_copy(
} }
/* Translate to on disk format */ /* Translate to on disk format */
put_unaligned(cpu_to_be64(ep->l0), &dp->l0); put_unaligned_be64(ep->l0, &dp->l0);
put_unaligned(cpu_to_be64(ep->l1), &dp->l1); put_unaligned_be64(ep->l1, &dp->l1);
dp++; dp++;
copied++; copied++;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment