From patchwork Tue Jun 13 17:15:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 9784397 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 845606038E for ; Tue, 13 Jun 2017 17:15:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 69BCB2853F for ; Tue, 13 Jun 2017 17:15:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5EAD32858F; Tue, 13 Jun 2017 17:15:40 +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 D100E2857E for ; Tue, 13 Jun 2017 17:15:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753584AbdFMRPi (ORCPT ); Tue, 13 Jun 2017 13:15:38 -0400 Received: from mail-io0-f172.google.com ([209.85.223.172]:35589 "EHLO mail-io0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752109AbdFMRPg (ORCPT ); Tue, 13 Jun 2017 13:15:36 -0400 Received: by mail-io0-f172.google.com with SMTP id k93so77694723ioi.2 for ; Tue, 13 Jun 2017 10:15:36 -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=M1Jy1S75CZ+SI1VVEidB3nWA4J3qSWlA5Md+QUpNn40=; b=m7Lg3tB5Z/uvmABvUPCavOgS2bDEpM/bvLk4Kw2fPMyOl2s0i/BbRxgOS4h5Exl7Uk UYE2qi4eZ9Xh5fgFfQ5HJcby6VqMqtmNNRhQNwwd/yWwzw+kzobUh5cX7OQFPbGpQ8W1 w/LbsIlBpAxtHvcI0foyitz9TXY3mKY0CSD0XmtjuBlyoCHs13pPdKTtpS/ibPfOUE8q rK2Oes86lvp40DL60W29TntJXPlnhXMpIA1rziTX5w2MOsG+lZqlKKKPu3rcIYUXBtb5 BNCUQc6A02kFa1dgYrZdfJ/5s/QaaQq3C5jvCxpRXweNoI6ozyLAKFRo0Mp/Hf9Qi4RD o5kA== 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=M1Jy1S75CZ+SI1VVEidB3nWA4J3qSWlA5Md+QUpNn40=; b=lGTLlCHRVJFkcyEtuVmc2XJgD4s7MAy4W0S2M6jLbEqmyUQiwb29/xfzOkRqFcCSbM I0FKHpTeXxrisGJq6sE4J1svO6IW8bNOElBx2rWCspE35RhgBrrr+hrdtceu7b3K5O4x rpYB5IAYpuxkALZMkpsH1Nqn/b3fIS5U2B+gDVVmC+UeUhN7HpWGM1Hm4250tiTUpIVN TcSIDa0FUsaNBjazkTB73rdiQo2Mpc5OaTMVfzHDZTuq9MFm6EOd3kQu6Xqw5/qkq0ae rXXHhfKyJ62P+MrNzf64l+pAIQmOavHCAqCb24aWWWWXJxJKULdPb2XqsEL5LlVnovzB Q7Zw== X-Gm-Message-State: AKS2vOwJHzxthlB3Gep//SNC2yDb4JhFYBcGYLP7DWZ5U0SSDNytf0TL aP6vl6XJKzTc7sQt X-Received: by 10.107.137.169 with SMTP id t41mr1227805ioi.217.1497374136139; Tue, 13 Jun 2017 10:15:36 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id y188sm6217526ity.9.2017.06.13.10.15.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Jun 2017 10:15:34 -0700 (PDT) From: Jens Axboe To: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 07/11] fs: add support for buffered writeback to pass down stream information Date: Tue, 13 Jun 2017 11:15:19 -0600 Message-Id: <1497374123-15286-8-git-send-email-axboe@kernel.dk> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497374123-15286-1-git-send-email-axboe@kernel.dk> References: <1497374123-15286-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 Signed-off-by: Jens Axboe Reviewed-by: Andreas Dilger --- fs/buffer.c | 14 +++++++++----- fs/mpage.c | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index 161be58c5cb0..8324c24751ca 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -49,7 +49,7 @@ static int fsync_buffers_list(spinlock_t *lock, struct list_head *list); static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh, - struct writeback_control *wbc); + unsigned int stream, struct writeback_control *wbc); #define BH_ENTRY(list) list_entry((list), struct buffer_head, b_assoc_buffers) @@ -1829,7 +1829,8 @@ int __block_write_full_page(struct inode *inode, struct page *page, do { struct buffer_head *next = bh->b_this_page; if (buffer_async_write(bh)) { - submit_bh_wbc(REQ_OP_WRITE, write_flags, bh, wbc); + submit_bh_wbc(REQ_OP_WRITE, write_flags, bh, + inode_streamid(inode), wbc); nr_underway++; } bh = next; @@ -1883,7 +1884,8 @@ int __block_write_full_page(struct inode *inode, struct page *page, struct buffer_head *next = bh->b_this_page; if (buffer_async_write(bh)) { clear_buffer_dirty(bh); - submit_bh_wbc(REQ_OP_WRITE, write_flags, bh, wbc); + submit_bh_wbc(REQ_OP_WRITE, write_flags, bh, + inode_streamid(inode), wbc); nr_underway++; } bh = next; @@ -3091,7 +3093,7 @@ void guard_bio_eod(int op, struct bio *bio) } static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh, - struct writeback_control *wbc) + unsigned int stream, struct writeback_control *wbc) { struct bio *bio; @@ -3130,6 +3132,8 @@ static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh, /* Take care of bh's that straddle the end of the device */ guard_bio_eod(op, bio); + bio_set_streamid(bio, stream); + if (buffer_meta(bh)) op_flags |= REQ_META; if (buffer_prio(bh)) @@ -3142,7 +3146,7 @@ static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh, int submit_bh(int op, int op_flags, struct buffer_head *bh) { - return submit_bh_wbc(op, op_flags, bh, NULL); + return submit_bh_wbc(op, op_flags, bh, 0, NULL); } EXPORT_SYMBOL(submit_bh); diff --git a/fs/mpage.c b/fs/mpage.c index baff8f820c29..a9d40c0c053e 100644 --- a/fs/mpage.c +++ b/fs/mpage.c @@ -614,6 +614,7 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc, goto confused; wbc_init_bio(wbc, bio); + bio_set_streamid(bio, inode_streamid(inode)); } /*