From patchwork Sun Apr 3 16:31:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 8734621 Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3F49E9F38C for ; Sun, 3 Apr 2016 16:32:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 57ED420219 for ; Sun, 3 Apr 2016 16:32:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 342D720212 for ; Sun, 3 Apr 2016 16:32:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754229AbcDCQbf (ORCPT ); Sun, 3 Apr 2016 12:31:35 -0400 Received: from mail-pf0-f182.google.com ([209.85.192.182]:34717 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751703AbcDCQbd (ORCPT ); Sun, 3 Apr 2016 12:31:33 -0400 Received: by mail-pf0-f182.google.com with SMTP id c20so18147095pfc.1; Sun, 03 Apr 2016 09:31:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GfRCyqqWaO2a70vloNR+IJYmiTMoW/Gg5dsEuxJ4uzo=; b=gJ9y26sbrRzZldvYa8aqlvrc7JWEaheWe0ST0hUA55HeUiqP0+ovQhOc8rGEJT1Yy3 RsAwFwsIWQmdEv+e8zttpLXllbU53jWiIWs926/OvvEejSGsl2xAcDMUrpmxEQp6OadX K3IIczgM9AMm/TOGpTktcLSBsBNwvG/1HrBkmfuiqsWjAyGdN2pjcaaq1RZpLX9qvWSo DTxSXB3MfXT+wvSZss5ADVV9MqVqZQTu7tnNybLipLYVYeSeFWYQ1HtQ0AjTbsIg7ltg cKfwxVNT+wQe1v640wqz56yC2i8Qx7d1O2KXzE24E2d0Z08Eg71YVi6UZ5ho9jvZj/y6 pn7g== X-Gm-Message-State: AD7BkJLPxf5Vd98KsW3u8YHK9S/eRZ6h5+52ic/xoVdvllQUevPq4wJV1l3+LNtBTnFH8w== X-Received: by 10.98.16.198 with SMTP id 67mr14212817pfq.21.1459701092843; Sun, 03 Apr 2016 09:31:32 -0700 (PDT) Received: from localhost (45-125-195-13.ip4.readyserver.sg. [45.125.195.13]) by smtp.gmail.com with ESMTPSA id a11sm3720381pat.6.2016.04.03.09.31.31 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Sun, 03 Apr 2016 09:31:32 -0700 (PDT) From: Ming Lei To: Jens Axboe , linux-kernel@vger.kernel.org Cc: linux-block@vger.kernel.org, Christoph Hellwig , Al Viro , Anton Altaparmakov , xfs@oss.sgi.com, Dave Chinner , drbd-dev@lists.linbit.com, Philipp Reisner , Lars Ellenberg , Boaz Harrosh , Ming Lei Subject: [PATCH v2 2/8] block: move two bvec structure into bvec.h Date: Mon, 4 Apr 2016 00:31:03 +0800 Message-Id: <1459701069-31406-3-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1459701069-31406-1-git-send-email-ming.lei@canonical.com> References: <1459701069-31406-1-git-send-email-ming.lei@canonical.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SBL, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 This patch moves 'struct bio_vec' and 'struct bvec_iter' into 'include/linux/bvec.h', then always include this header into 'include/linux/blk_types.h'. With this change, both 'struct bvec_iter' and bvec iterator helpers don't depend on CONFIG_BLOCK any more, then we can use bvec iterator to implement iterate_bvec(): lib/iov_iter.c. Suggested-by: Christoph Hellwig Signed-off-by: Ming Lei --- include/linux/bio.h | 1 - include/linux/blk_types.h | 22 +--------------------- include/linux/bvec.h | 20 +++++++++++++++++++- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/include/linux/bio.h b/include/linux/bio.h index 78cf737..7f998ac 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -31,7 +31,6 @@ /* struct bio, bio_vec and BIO_* flags are defined in blk_types.h */ #include -#include #define BIO_DEBUG diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index 86a38ea..a8d8e1f 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -6,6 +6,7 @@ #define __LINUX_BLK_TYPES_H #include +#include struct bio_set; struct bio; @@ -17,28 +18,7 @@ struct cgroup_subsys_state; typedef void (bio_end_io_t) (struct bio *); typedef void (bio_destructor_t) (struct bio *); -/* - * was unsigned short, but we might as well be ready for > 64kB I/O pages - */ -struct bio_vec { - struct page *bv_page; - unsigned int bv_len; - unsigned int bv_offset; -}; - #ifdef CONFIG_BLOCK - -struct bvec_iter { - sector_t bi_sector; /* device address in 512 byte - sectors */ - unsigned int bi_size; /* residual I/O count */ - - unsigned int bi_idx; /* current index into bvl_vec */ - - unsigned int bi_bvec_done; /* number of bytes completed in - current bvec */ -}; - /* * main unit of I/O for the block layer and lower layers (ie drivers and * stacking drivers) diff --git a/include/linux/bvec.h b/include/linux/bvec.h index 29c459d..e111124 100644 --- a/include/linux/bvec.h +++ b/include/linux/bvec.h @@ -20,7 +20,25 @@ #ifndef __LINUX_BVEC_ITER_H #define __LINUX_BVEC_ITER_H -#include +/* + * was unsigned short, but we might as well be ready for > 64kB I/O pages + */ +struct bio_vec { + struct page *bv_page; + unsigned int bv_len; + unsigned int bv_offset; +}; + +struct bvec_iter { + sector_t bi_sector; /* device address in 512 byte + sectors */ + unsigned int bi_size; /* residual I/O count */ + + unsigned int bi_idx; /* current index into bvl_vec */ + + unsigned int bi_bvec_done; /* number of bytes completed in + current bvec */ +}; /* * various member access, note that bio_data should of course not be used