xfs: always complete the buffer inline in xfs_buf_submit

xfs_buf_submit now only completes a buffer on error, or for in-memory
buftargs.  There is no point in using a workqueue for the latter as
the completion will just wake up the caller.  Optimize this case by
avoiding the workqueue roundtrip.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 49d087d9ba485e601b7ec70c982750feef10a87f..8e795ccd57d6491ff2f486e3d44f6a57eed54166 100644 (file)
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -1657,21 +1657,17 @@ xfs_buf_submit(
 
        if ((bp->b_flags & XBF_WRITE) && !xfs_buf_verify_write(bp)) {
                xfs_force_shutdown(bp->b_mount, SHUTDOWN_CORRUPT_INCORE);
-               goto done;
+               xfs_buf_ioend(bp);
+               return;
        }
 
        /* In-memory targets are directly mapped, no I/O required. */
-       if (xfs_buftarg_is_mem(bp->b_target))
-               goto done;
+       if (xfs_buftarg_is_mem(bp->b_target)) {
+               xfs_buf_ioend(bp);
+               return;
+       }
 
        xfs_buf_submit_bio(bp);
-       return;
-
-done:
-       if (bp->b_error || !(bp->b_flags & XBF_ASYNC))
-               xfs_buf_ioend(bp);
-       else
-               xfs_buf_ioend_async(bp);
 }
 
 void *