From patchwork Wed Mar 25 15:07:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 6093141 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 14A51BF90F for ; Wed, 25 Mar 2015 15:12:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2FEB920114 for ; Wed, 25 Mar 2015 15:12:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D69E2018E for ; Wed, 25 Mar 2015 15:12:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933359AbbCYPML (ORCPT ); Wed, 25 Mar 2015 11:12:11 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:5162 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752909AbbCYPH5 (ORCPT ); Wed, 25 Mar 2015 11:07:57 -0400 Received: from pps.filterd (m0004346 [127.0.0.1]) by mx0a-00082601.pphosted.com (8.14.5/8.14.5) with SMTP id t2PF56Wp004495; Wed, 25 Mar 2015 08:07:55 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=facebook; bh=uOdn3NWroScjNZ5eweQxHOFBT6gWRlW5sc/3XpmbOw8=; b=CN7POxeL90zA00NSMOTg0HASLM0AqdaIBKV9l+8kCdL82HPYaXgURxPy6KXUXFz2LupR ZwWx7ltsz/x0eK/koGQ7gQkinWWiUcw3H3W85bvT9VnOq27wXD4RG8Fxx4igpE6vzEBl 1FC0jPe0uSVL6wlqA+T8Zwg+xgnFa664JCM= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 1tbw358836-2 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Wed, 25 Mar 2015 08:07:55 -0700 Received: from localhost.localdomain (192.168.54.13) by mail.thefacebook.com (192.168.16.20) with Microsoft SMTP Server (TLS) id 14.3.195.1; Wed, 25 Mar 2015 08:07:54 -0700 From: Jens Axboe To: , CC: , , Jens Axboe Subject: [PATCH 3/7] direct-io: add support for write stream IDs Date: Wed, 25 Mar 2015 09:07:46 -0600 Message-ID: <1427296070-8472-4-git-send-email-axboe@fb.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427296070-8472-1-git-send-email-axboe@fb.com> References: <1427296070-8472-1-git-send-email-axboe@fb.com> MIME-Version: 1.0 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.13.68, 1.0.33, 0.0.0000 definitions=2015-03-25_04:2015-03-25, 2015-03-25, 1970-01-01 signatures=0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Get the streamid from the file, if any, and set it on the bio. Signed-off-by: Jens Axboe --- fs/direct-io.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/direct-io.c b/fs/direct-io.c index e181b6b2e297..3ec57abb524f 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c @@ -77,6 +77,7 @@ struct dio_submit { int reap_counter; /* rate limit reaping */ sector_t final_block_in_request;/* doesn't change */ int boundary; /* prev block is at a boundary */ + int streamid; /* Write stream ID */ get_block_t *get_block; /* block mapping function */ dio_submit_t *submit_io; /* IO submition function */ @@ -372,6 +373,8 @@ dio_bio_alloc(struct dio *dio, struct dio_submit *sdio, sdio->bio = bio; sdio->logical_offset_in_bio = sdio->cur_page_fs_offset; + + bio_set_streamid(bio, sdio->streamid); } /* @@ -1205,6 +1208,7 @@ do_blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode, sdio.blkbits = blkbits; sdio.blkfactor = i_blkbits - blkbits; sdio.block_in_file = offset >> blkbits; + sdio.streamid = file_streamid(iocb->ki_filp); sdio.get_block = get_block; dio->end_io = end_io;