aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_buf_item.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2010-06-23 04:11:15 -0400
committerAlex Elder <aelder@sgi.com>2010-07-26 14:16:34 -0400
commite98c414f9a3134fe7efc56ef8f1d394b54bfd40e (patch)
treeb3d4696cfb4875af39041f9ddcd642bd1cd90a29 /fs/xfs/xfs_buf_item.c
parent3400777ff03a3cd4fdbc6cb15676fc7e7ceefc00 (diff)
xfs: simplify log item descriptor tracking
Currently we track log item descriptor belonging to a transaction using a complex opencoded chunk allocator. This code has been there since day one and seems to work around the lack of an efficient slab allocator. This patch replaces it with dynamically allocated log item descriptors from a dedicated slab pool, linked to the transaction by a linked list. This allows to greatly simplify the log item descriptor tracking to the point where it's just a couple hundred lines in xfs_trans.c instead of a separate file. The external API has also been simplified while we're at it - the xfs_trans_add_item and xfs_trans_del_item functions to add/ delete items from a transaction have been simplified to the bare minium, and the xfs_trans_find_item function is replaced with a direct dereference of the li_desc field. All debug code walking the list of log items in a transaction is down to a simple list_for_each_entry. Note that we could easily use a singly linked list here instead of the double linked list from list.h as the fastpath only does deletion from sequential traversal. But given that we don't have one available as a library function yet I use the list.h functions for simplicity. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Dave Chinner <dchinner@redhat.com>
Diffstat (limited to 'fs/xfs/xfs_buf_item.c')
-rw-r--r--fs/xfs/xfs_buf_item.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
index 91ad92e83bc6..711f69abbbe4 100644
--- a/fs/xfs/xfs_buf_item.c
+++ b/fs/xfs/xfs_buf_item.c
@@ -460,13 +460,10 @@ xfs_buf_item_unpin_remove(
460 * occurs later in the xfs_trans_uncommit() will try to 460 * occurs later in the xfs_trans_uncommit() will try to
461 * reference the buffer which we no longer have a hold on. 461 * reference the buffer which we no longer have a hold on.
462 */ 462 */
463 struct xfs_log_item_desc *lidp;
464
465 ASSERT(XFS_BUF_VALUSEMA(bip->bli_buf) <= 0); 463 ASSERT(XFS_BUF_VALUSEMA(bip->bli_buf) <= 0);
466 trace_xfs_buf_item_unpin_stale(bip); 464 trace_xfs_buf_item_unpin_stale(bip);
467 465
468 lidp = xfs_trans_find_item(tp, (xfs_log_item_t *)bip); 466 xfs_trans_del_item(&bip->bli_item);
469 xfs_trans_free_item(tp, lidp);
470 467
471 /* 468 /*
472 * Since the transaction no longer refers to the buffer, the 469 * Since the transaction no longer refers to the buffer, the