Commit 0b4db5df authored by Eric Sandeen's avatar Eric Sandeen Committed by Dave Chinner

xfs: remove extraneous buffer flag changes

Fix up a couple places where extra flag manipulation occurs.

In the first case we clear XBF_ASYNC and then immediately reset it -
so don't bother clearing in the first place.

In the 2nd case we are at a point in the function where the buffer
must already be async, so there is no need to reset it.

Add consistent spacing around the " | " while we're at it.
Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent e97f6c54
...@@ -1816,7 +1816,7 @@ __xfs_buf_delwri_submit( ...@@ -1816,7 +1816,7 @@ __xfs_buf_delwri_submit(
blk_start_plug(&plug); blk_start_plug(&plug);
list_for_each_entry_safe(bp, n, io_list, b_list) { list_for_each_entry_safe(bp, n, io_list, b_list) {
bp->b_flags &= ~(_XBF_DELWRI_Q | XBF_ASYNC | XBF_WRITE_FAIL); bp->b_flags &= ~(_XBF_DELWRI_Q | XBF_WRITE_FAIL);
bp->b_flags |= XBF_WRITE | XBF_ASYNC; bp->b_flags |= XBF_WRITE | XBF_ASYNC;
/* /*
......
...@@ -1080,10 +1080,9 @@ xfs_buf_iodone_callback_error( ...@@ -1080,10 +1080,9 @@ xfs_buf_iodone_callback_error(
* async write failure at least once, but we also need to set the buffer * async write failure at least once, but we also need to set the buffer
* up to behave correctly now for repeated failures. * up to behave correctly now for repeated failures.
*/ */
if (!(bp->b_flags & (XBF_STALE|XBF_WRITE_FAIL)) || if (!(bp->b_flags & (XBF_STALE | XBF_WRITE_FAIL)) ||
bp->b_last_error != bp->b_error) { bp->b_last_error != bp->b_error) {
bp->b_flags |= (XBF_WRITE | XBF_ASYNC | bp->b_flags |= (XBF_WRITE | XBF_DONE | XBF_WRITE_FAIL);
XBF_DONE | XBF_WRITE_FAIL);
bp->b_last_error = bp->b_error; bp->b_last_error = bp->b_error;
bp->b_retries = 0; bp->b_retries = 0;
bp->b_first_retry_time = jiffies; bp->b_first_retry_time = jiffies;
......
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