Merge branch 'akpm' (patches from Andrew)

[mirror_ubuntu-artful-kernel.git] / fs / xfs / xfs_buf_item.c

diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
index 2975cb2319f4864623a8fa38350c39a7e0a401f4..0306168af332c5e0a308f4ad78233c1a1cd03979 100644 (file)
--- a/fs/xfs/xfs_buf_item.c
+++ b/fs/xfs/xfs_buf_item.c
@@ -1162,6 +1162,7 @@ xfs_buf_iodone_callbacks(
         */
        bp->b_last_error = 0;
        bp->b_retries = 0;
+       bp->b_first_retry_time = 0;
 
        xfs_buf_do_callbacks(bp);
        bp->b_fspriv = NULL;