On Fri, Jul 08, 2016 at 11:28:02PM -0500, Eric Sandeen wrote:
> 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@xxxxxxxxxx>
This makes sense too.
Reviewed-by: Carlos Maiolino <cmaiolino@xxxxxxxxxx>
> ---
>
> V2: fix subject, sorry!
>
> diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
> index e71cfbd..5d52e44 100644
> --- a/fs/xfs/xfs_buf.c
> +++ b/fs/xfs/xfs_buf.c
> @@ -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;
>
> /*
> diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
> index 3425799..6a2f429 100644
> --- a/fs/xfs/xfs_buf_item.c
> +++ b/fs/xfs/xfs_buf_item.c
> @@ -1080,10 +1080,9 @@ xfs_buf_iodone_callback_error(
> * async write failure at least once, but we also need to set the buffer
> * 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_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;
>
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs
>
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs
--
Carlos
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
