Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933145AbbEEUFS (ORCPT ); Tue, 5 May 2015 16:05:18 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:32211 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933044AbbEEUDN (ORCPT ); Tue, 5 May 2015 16:03:13 -0400 From: Jens Axboe To: , CC: , , Jens Axboe Subject: [PATCH 5/7] btrfs: add support for write stream IDs Date: Tue, 5 May 2015 14:02:59 -0600 Message-ID: <1430856181-19568-6-git-send-email-axboe@fb.com> X-Mailer: git-send-email 2.4.0.rc2.1.g3d6bc9a In-Reply-To: <1430856181-19568-1-git-send-email-axboe@fb.com> References: <1430856181-19568-1-git-send-email-axboe@fb.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.168.54.13] X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.14.151,1.0.33,0.0.0000 definitions=2015-05-05_06:2015-05-05,2015-05-05,1970-01-01 signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1358 Lines: 41 Both buffered and O_DIRECT. Signed-off-by: Jens Axboe Acked-by: Chris Mason --- fs/btrfs/extent_io.c | 1 + fs/btrfs/inode.c | 1 + 2 files changed, 2 insertions(+) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 43af5a61ad25..f0d46e2622ae 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -2838,6 +2838,7 @@ static int submit_extent_page(int rw, struct extent_io_tree *tree, bio_add_page(bio, page, page_size, offset); bio->bi_end_io = end_io_func; bio->bi_private = tree; + bio_set_streamid(bio, inode_streamid(page->mapping->host)); if (bio_ret) *bio_ret = bio; diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 8bb013672aee..93aac5436e60 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -8180,6 +8180,7 @@ static void btrfs_submit_direct(int rw, struct bio *dio_bio, atomic_set(&dip->pending_bios, 0); btrfs_bio = btrfs_io_bio(io_bio); btrfs_bio->logical = file_offset; + bio_set_streamid(io_bio, inode_streamid(inode)); if (write) { io_bio->bi_end_io = btrfs_endio_direct_write; -- 2.4.0.rc2.1.g3d6bc9a -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/