add rec_len and key_len fields to struct xfs_btree_ops

Index: linux-2.6-xfs/fs/xfs/xfs_alloc_btree.c
===================================================================
@@ -261,33 +261,6 @@ xfs_allocbt_init_rec_from_cur(
 	rec->alloc.ar_blockcount = cpu_to_be32(cur->bc_rec.a.ar_blockcount);
 }
 
-STATIC union xfs_btree_ptr *
-xfs_allocbt_ptr_addr(
-	struct xfs_btree_cur	*cur,
-	int			index,
-	struct xfs_btree_block	*block)
-{
-	return (union xfs_btree_ptr *)XFS_ALLOC_PTR_ADDR(block, index, cur);
-}
-
-STATIC union xfs_btree_key *
-xfs_allocbt_key_addr(
-	struct xfs_btree_cur	*cur,
-	int			index,
-	struct xfs_btree_block	*block)
-{
-	return (union xfs_btree_key *)XFS_ALLOC_KEY_ADDR(block, index, cur);
-}
-
-STATIC union xfs_btree_rec *
-xfs_allocbt_rec_addr(
-	struct xfs_btree_cur	*cur,
-	int			index,
-	struct xfs_btree_block	*block)
-{
-	return (union xfs_btree_rec *)XFS_ALLOC_REC_ADDR(block, index, cur);
-}
-
 STATIC __int64_t
 xfs_allocbt_key_diff(
 	struct xfs_btree_cur	*cur,

@@ -309,161 +282,6 @@ xfs_allocbt_key_diff(
 	return (__int64_t)be32_to_cpu(kp->ar_startblock) - rec->ar_startblock;
 }
 
-STATIC void
-xfs_allocbt_set_key(
-	struct xfs_btree_cur	*cur,
-	union xfs_btree_key	*key_addr,
-	int			index,
-	union xfs_btree_key	*newkey)
-{
-	xfs_alloc_key_t		*kp = &key_addr->alloc;
-
-	kp[index] = newkey->alloc;
-}
-
-STATIC void
-xfs_allocbt_set_rec(
-	struct xfs_btree_cur	*cur,
-	union xfs_btree_rec	*rec_addr,
-	int			index,
-	union xfs_btree_rec	*newrec)
-{
-	xfs_alloc_rec_t		*rp = &rec_addr->alloc;
-
-	rp[index] = newrec->alloc;
-}
-
-STATIC void
-xfs_allocbt_move_keys(
-	struct xfs_btree_cur	*cur,
-	union xfs_btree_key	*base,
-	int			from,
-	int			to,
-	int			numkeys)
-{
-	xfs_alloc_key_t		*kp = &base->alloc;
-
-	ASSERT(from >= 0);
-	ASSERT(to >= 0);
-	ASSERT(numkeys >= 0);
-
-	memmove(&kp[to], &kp[from], numkeys * sizeof(*kp));
-}
-
-STATIC void
-xfs_allocbt_move_recs(
-	struct xfs_btree_cur	*cur,
-	union xfs_btree_rec	*base,
-	int			from,
-	int			to,
-	int			numrecs)
-{
-	xfs_alloc_rec_t		*rp = &base->alloc;
-
-	ASSERT(from >= 0);
-	ASSERT(to >= 0);
-	ASSERT(numrecs >= 0);
-
-	memmove(&rp[to], &rp[from], numrecs * sizeof(*rp));
-}
-
-STATIC void
-xfs_allocbt_copy_keys(
-	struct xfs_btree_cur	*cur,
-	union xfs_btree_key	*src_key,
-	union xfs_btree_key	*dst_key,
-	int			numkeys)
-{
-	ASSERT(numkeys >= 0);
-	memcpy(dst_key, src_key, numkeys * sizeof(xfs_alloc_key_t));
-}
-
-STATIC void
-xfs_allocbt_copy_recs(
-	struct xfs_btree_cur	*cur,
-	union xfs_btree_rec	*src_rec,
-	union xfs_btree_rec	*dst_rec,
-	int			numrecs)
-{
-	ASSERT(numrecs >= 0);
-	memcpy(dst_rec, src_rec, numrecs * sizeof(xfs_alloc_rec_t));
-}
-
-/*
- * Log keys from a btree block (nonleaf).
- */
-STATIC void
-xfs_allocbt_log_keys(
-	struct xfs_btree_cur	*cur,	/* btree cursor */
-	struct xfs_buf		*bp,	/* buffer containing btree block */
-	int			first,	/* index of first key to log */
-	int			last)	/* index of last key to log */
-{
-	struct xfs_btree_block	*block = XFS_BUF_TO_BLOCK(bp);
-	xfs_alloc_key_t		*kp = XFS_ALLOC_KEY_ADDR(block, 1, cur);
-	char			*baddr = (char *)block;
-	int			start;	/* first byte offset logged */
-	int			end;	/* last byte offset logged */
-
-	XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-	XFS_BTREE_TRACE_ARGBII(cur, bp, first, last);
-
-	start = (char *)&kp[first - 1] - baddr;
-	end = (char *)&kp[last] - 1 - baddr;
-	xfs_trans_log_buf(cur->bc_tp, bp, start, end);
-
-	XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
-}
-
-#ifdef DEBUG
-STATIC void
-xfs_alloc_log_recs_check(
-	struct xfs_btree_cur	*cur,
-	xfs_alloc_rec_t		*rp,
-	int			first,
-	int			last)
-{
-	struct xfs_agf		*agf = XFS_BUF_TO_AGF(cur->bc_private.a.agbp);
-	xfs_alloc_rec_t		*p;
-
-	for (p = &rp[first - 1]; p <= &rp[last - 1]; p++) {
-		ASSERT(be32_to_cpu(p->ar_startblock) +
-		       be32_to_cpu(p->ar_blockcount) <=
-		       be32_to_cpu(agf->agf_length));
-	}
-}
-#else
-#define xfs_alloc_log_recs_check(cur, bp, first, last)
-#endif
-
-/*
- * Log records from a btree block (leaf).
- */
-STATIC void
-xfs_allocbt_log_recs(
-	struct xfs_btree_cur	*cur,	/* btree cursor */
-	struct xfs_buf		*bp,	/* buffer containing btree block */
-	int			first,	/* index of first record to log */
-	int			last)	/* index of last record to log */
-{
-	struct xfs_btree_block	*block = XFS_BUF_TO_BLOCK(bp);
-	xfs_alloc_rec_t		*rp = XFS_ALLOC_REC_ADDR(block, 1, cur);
-	char			*baddr = (char *)block;
-	int			start;	/* first byte offset logged */
-	int			end;	/* last byte offset logged */
-
-	XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
-	XFS_BTREE_TRACE_ARGBII(cur, bp, first, last);
-
-	xfs_alloc_log_recs_check(cur, rp, first, last);
-
-	start = (char *)&rp[first - 1] - baddr;
-	end = (char *)&rp[last] - 1 - baddr;
-	xfs_trans_log_buf(cur->bc_tp, bp, start, end);
-
-	XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT);
-}
-
 #ifdef XFS_BTREE_TRACE
 
 ktrace_t	*xfs_allocbt_trace_buf;

@@ -532,6 +350,9 @@ xfs_allocbt_trace_record(
 #endif /* XFS_BTREE_TRACE */
 
 static const struct xfs_btree_ops xfs_allocbt_ops = {
+	.key_len		= sizeof(xfs_alloc_key_t),
+	.rec_len		= sizeof(xfs_alloc_rec_t),
+
 	.dup_cursor		= xfs_allocbt_dup_cursor,
 	.set_root		= xfs_allocbt_set_root,
 	.alloc_block		= xfs_allocbt_alloc_block,

@@ -543,18 +364,7 @@ static const struct xfs_btree_ops xfs_al
 	.init_ptr_from_cur	= xfs_allocbt_init_ptr_from_cur,
 	.init_rec_from_key	= xfs_allocbt_init_rec_from_key,
 	.init_rec_from_cur	= xfs_allocbt_init_rec_from_cur,
-	.ptr_addr		= xfs_allocbt_ptr_addr,
-	.key_addr		= xfs_allocbt_key_addr,
-	.rec_addr		= xfs_allocbt_rec_addr,
 	.key_diff		= xfs_allocbt_key_diff,
-	.set_key		= xfs_allocbt_set_key,
-	.set_rec		= xfs_allocbt_set_rec,
-	.move_keys		= xfs_allocbt_move_keys,
-	.move_recs		= xfs_allocbt_move_recs,
-	.copy_keys		= xfs_allocbt_copy_keys,
-	.copy_recs		= xfs_allocbt_copy_recs,
-	.log_keys		= xfs_allocbt_log_keys,
-	.log_recs		= xfs_allocbt_log_recs,
 
 #ifdef XFS_BTREE_TRACE
 	.trace_enter		= xfs_allocbt_trace_enter,

202 lines not on this page · raw message

770 lines not on this page · raw message

67 lines not on this page · raw message

199 lines not on this page · raw message

Index: linux-2.6-xfs/fs/xfs/xfs_bmap.c
===================================================================
@@ -3564,7 +3564,7 @@ xfs_bmap_extents_to_btree(
 	 * the root is at the right level.
 	 */
 	xfs_btree_log_block(cur, abp, XFS_BB_ALL_BITS);
-	xfs_bmbt_log_recs(cur, abp, 1, be16_to_cpu(ablock->bb_numrecs));
+	xfs_btree_log_recs(cur, abp, 1, be16_to_cpu(ablock->bb_numrecs));
 	ASSERT(*curp == NULL);
 	*curp = cur;
 	*logflagsp = XFS_ILOG_CORE | XFS_ILOG_FBROOT(whichfork);