Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b4db5df authored Jul 20, 2016 by Eric Sandeen Committed by Dave Chinner Jul 20, 2016

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: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

parent e97f6c54

fs/xfs/xfs_buf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1816,7 +1816,7 @@ __xfs_buf_delwri_submit(

		blk_start_plug(&plug);
		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;

		/*

fs/xfs/xfs_buf_item.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -1082,8 +1082,7 @@ xfs_buf_iodone_callback_error(
		*/
		if (!(bp->b_flags & (XBF_STALE \| XBF_WRITE_FAIL)) \|\|
		bp->b_last_error != bp->b_error) {
		bp->b_flags \|= (XBF_WRITE \| XBF_ASYNC \|
		XBF_DONE \| XBF_WRITE_FAIL);
		bp->b_flags \|= (XBF_WRITE \| XBF_DONE \| XBF_WRITE_FAIL);
		bp->b_last_error = bp->b_error;
		bp->b_retries = 0;
		bp->b_first_retry_time = jiffies;