Commit fe211e17 authored by Brian Foster's avatar Brian Foster Committed by Greg Kroah-Hartman

xfs: don't log dirty ranges for ordered buffers

commit 8dc518df upstream.

Ordered buffers are attached to transactions and pushed through the
logging infrastructure just like normal buffers with the exception
that they are not actually written to the log. Therefore, we don't
need to log dirty ranges of ordered buffers. xfs_trans_log_buf() is
called on ordered buffers to set up all of the dirty state on the
transaction, buffer and log item and prepare the buffer for I/O.

Now that xfs_trans_dirty_buf() is available, call it from
xfs_trans_ordered_buf() so the latter is now mutually exclusive with
xfs_trans_log_buf(). This reflects the implementation of ordered
buffers and helps eliminate confusion over the need to log ranges of
ordered buffers just to set up internal log state.
Signed-off-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarAllison Henderson <allison.henderson@oracle.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 19a87a94
...@@ -4447,12 +4447,10 @@ xfs_btree_block_change_owner( ...@@ -4447,12 +4447,10 @@ xfs_btree_block_change_owner(
* though, so everything is consistent in memory. * though, so everything is consistent in memory.
*/ */
if (bp) { if (bp) {
if (cur->bc_tp) { if (cur->bc_tp)
xfs_trans_ordered_buf(cur->bc_tp, bp); xfs_trans_ordered_buf(cur->bc_tp, bp);
xfs_btree_log_block(cur, bp, XFS_BB_OWNER); else
} else {
xfs_buf_delwri_queue(bp, bbcoi->buffer_list); xfs_buf_delwri_queue(bp, bbcoi->buffer_list);
}
} else { } else {
ASSERT(cur->bc_flags & XFS_BTREE_ROOT_IN_INODE); ASSERT(cur->bc_flags & XFS_BTREE_ROOT_IN_INODE);
ASSERT(level == cur->bc_nlevels - 1); ASSERT(level == cur->bc_nlevels - 1);
......
...@@ -368,8 +368,6 @@ xfs_ialloc_inode_init( ...@@ -368,8 +368,6 @@ xfs_ialloc_inode_init(
* transaction and pin the log appropriately. * transaction and pin the log appropriately.
*/ */
xfs_trans_ordered_buf(tp, fbuf); xfs_trans_ordered_buf(tp, fbuf);
xfs_trans_log_buf(tp, fbuf, 0,
BBTOB(fbuf->b_length) - 1);
} }
} else { } else {
fbuf->b_flags |= XBF_DONE; fbuf->b_flags |= XBF_DONE;
......
...@@ -560,16 +560,12 @@ xfs_trans_log_buf( ...@@ -560,16 +560,12 @@ xfs_trans_log_buf(
struct xfs_buf_log_item *bip = bp->b_fspriv; struct xfs_buf_log_item *bip = bp->b_fspriv;
ASSERT(first <= last && last < BBTOB(bp->b_length)); ASSERT(first <= last && last < BBTOB(bp->b_length));
ASSERT(!(bip->bli_flags & XFS_BLI_ORDERED));
xfs_trans_dirty_buf(tp, bp); xfs_trans_dirty_buf(tp, bp);
/*
* If we have an ordered buffer we are not logging any dirty range but
* it still needs to be marked dirty and that it has been logged.
*/
trace_xfs_trans_log_buf(bip); trace_xfs_trans_log_buf(bip);
if (!(bip->bli_flags & XFS_BLI_ORDERED)) xfs_buf_item_log(bip, first, last);
xfs_buf_item_log(bip, first, last);
} }
...@@ -722,12 +718,11 @@ xfs_trans_inode_alloc_buf( ...@@ -722,12 +718,11 @@ xfs_trans_inode_alloc_buf(
} }
/* /*
* Mark the buffer as ordered for this transaction. This means * Mark the buffer as ordered for this transaction. This means that the contents
* that the contents of the buffer are not recorded in the transaction * of the buffer are not recorded in the transaction but it is tracked in the
* but it is tracked in the AIL as though it was. This allows us * AIL as though it was. This allows us to record logical changes in
* to record logical changes in transactions rather than the physical * transactions rather than the physical changes we make to the buffer without
* changes we make to the buffer without changing writeback ordering * changing writeback ordering constraints of metadata buffers.
* constraints of metadata buffers.
*/ */
void void
xfs_trans_ordered_buf( xfs_trans_ordered_buf(
...@@ -739,9 +734,16 @@ xfs_trans_ordered_buf( ...@@ -739,9 +734,16 @@ xfs_trans_ordered_buf(
ASSERT(bp->b_transp == tp); ASSERT(bp->b_transp == tp);
ASSERT(bip != NULL); ASSERT(bip != NULL);
ASSERT(atomic_read(&bip->bli_refcount) > 0); ASSERT(atomic_read(&bip->bli_refcount) > 0);
ASSERT(!xfs_buf_item_dirty_format(bip));
bip->bli_flags |= XFS_BLI_ORDERED; bip->bli_flags |= XFS_BLI_ORDERED;
trace_xfs_buf_item_ordered(bip); trace_xfs_buf_item_ordered(bip);
/*
* We don't log a dirty range of an ordered buffer but it still needs
* to be marked dirty and that it has been logged.
*/
xfs_trans_dirty_buf(tp, bp);
} }
/* /*
......
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