From patchwork Wed Jun 14 04:01:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 9785289 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5849560325 for ; Wed, 14 Jun 2017 04:02:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5FB00283BD for ; Wed, 14 Jun 2017 04:02:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54ACF28589; Wed, 14 Jun 2017 04:02:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50DF32844E for ; Wed, 14 Jun 2017 04:02:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750769AbdFNECP (ORCPT ); Wed, 14 Jun 2017 00:02:15 -0400 Received: from mail-pf0-f170.google.com ([209.85.192.170]:33880 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750728AbdFNECL (ORCPT ); Wed, 14 Jun 2017 00:02:11 -0400 Received: by mail-pf0-f170.google.com with SMTP id s66so9414427pfs.1 for ; Tue, 13 Jun 2017 21:02:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gCZce871bWE0gbqt1635ZZGfGdiQJCfcK2t3nUr4O60=; b=LZqGm2Ep98m6ZctH3OP9FyqTP5BK+R8mJyd52L7txMs8tpFPI+GPCeWDbojczT9W7l JLzKb7xHZgaHlvTtgiTW18QnSuY8AxFVheuG0nf0cfBm4eKRQJVccArPnyVqsqtXPrYA Uz2QL7VDuEAGDcrO/Fbdt1TIAVINJYmlClUdPGmOrMhtgRS3zR0/w0frfEuwZWrmYTb4 wOror/FQ2TCRuECV7GeIrbtYQPy7XC37Qn2Jbk9/sTksvwEx4OWoSu4GuB113nidLHpe UfvoQin45Ho84sQ/8qvtWCeHipPu9IdXzzQkLHoqxWnOr4W2iNMN1IExtn1UpLCPvX3z 9BPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gCZce871bWE0gbqt1635ZZGfGdiQJCfcK2t3nUr4O60=; b=kmlQpIixUEeII6MxfuZEyb6lrbLIk4uSdwV67cstHJtimDlo0m+XlijzfcWpoFQh4/ e+3CjYq+3VzqLUlANUeWlrtpoBkc8j19rUdVT1b01VZ2H1HnaWem6JUm9ADy1HrHxtLH 61YoAM31UO32Ngp46n8K7jMFqN7xon6kau55wJXFY8B4I8VlS2yGrO3NTiD7BvNxLfiq bRWHYrPczlxTfrNsxJhyJJ0G9VBKsfwICMjVze5A+0SROiDNDvf3Zeahgq8YJZ0ZDdaY ZFGgOffjF32WlRCeKlJCY1ZsIC9uMUpIeABDwSR+6FC4H7yb1gpRYcA35NRYmRE3GH8q waHQ== X-Gm-Message-State: AKS2vOyDCb6Zb2AHmCJCZNwLBxJMVSm0iTK9vb/VJEf8QuqQpnYZmOgY Y1d+woexM4lt1R5M X-Received: by 10.98.150.9 with SMTP id c9mr2042546pfe.201.1497412930862; Tue, 13 Jun 2017 21:02:10 -0700 (PDT) Received: from localhost.localdomain (66.29.164.166.static.utbb.net. [66.29.164.166]) by smtp.gmail.com with ESMTPSA id f8sm30914083pfc.14.2017.06.13.21.02.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Jun 2017 21:02:10 -0700 (PDT) From: Jens Axboe To: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org Cc: adilger@dilger.ca, Jens Axboe Subject: [PATCH 05/10] fs: add O_DIRECT support for sending down bio stream information Date: Tue, 13 Jun 2017 22:01:54 -0600 Message-Id: <1497412919-19400-6-git-send-email-axboe@kernel.dk> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497412919-19400-1-git-send-email-axboe@kernel.dk> References: <1497412919-19400-1-git-send-email-axboe@kernel.dk> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Reviewed-by: Andreas Dilger Signed-off-by: Jens Axboe --- fs/block_dev.c | 2 ++ fs/direct-io.c | 2 ++ fs/iomap.c | 1 + 3 files changed, 5 insertions(+) diff --git a/fs/block_dev.c b/fs/block_dev.c index 519599dddd36..284b8a786283 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -227,6 +227,7 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter, bio.bi_iter.bi_sector = pos >> 9; bio.bi_private = current; bio.bi_end_io = blkdev_bio_end_io_simple; + bio.bi_stream = iocb_streamid(iocb); ret = bio_iov_iter_get_pages(&bio, iter); if (unlikely(ret)) @@ -360,6 +361,7 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages) bio->bi_iter.bi_sector = pos >> 9; bio->bi_private = dio; bio->bi_end_io = blkdev_bio_end_io; + bio->bi_stream = iocb_streamid(iocb); ret = bio_iov_iter_get_pages(bio, iter); if (unlikely(ret)) { diff --git a/fs/direct-io.c b/fs/direct-io.c index a04ebea77de8..c9c8b9fd4329 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c @@ -386,6 +386,8 @@ dio_bio_alloc(struct dio *dio, struct dio_submit *sdio, else bio->bi_end_io = dio_bio_end_io; + bio->bi_stream = iocb_streamid(dio->iocb); + sdio->bio = bio; sdio->logical_offset_in_bio = sdio->cur_page_fs_offset; } diff --git a/fs/iomap.c b/fs/iomap.c index 4b10892967a5..fa7d29632fbc 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -804,6 +804,7 @@ iomap_dio_actor(struct inode *inode, loff_t pos, loff_t length, if (dio->flags & IOMAP_DIO_WRITE) { bio_set_op_attrs(bio, REQ_OP_WRITE, REQ_SYNC | REQ_IDLE); + bio_set_streamid(bio, inode_streamid(inode)); task_io_account_write(bio->bi_iter.bi_size); } else { bio_set_op_attrs(bio, REQ_OP_READ, 0);