Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-18 06:15:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xfs: remove extraneous buffer flag changes

Browse Source 
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: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Eric Sandeen 2016-07-20 10:53:22 +10:00 committed by Dave Chinner
parent e97f6c545f
commit 0b4db5dff3
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/xfs_buf.c
View File

@ -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;
/* /*

5
fs/xfs/xfs_buf_item.c
View File

@ -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;