From patchwork Thu Apr 14 11:46:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 8834731 Return-Path: X-Original-To: patchwork-linux-block@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 17189C0553 for ; Thu, 14 Apr 2016 11:50:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2F9EC2011D for ; Thu, 14 Apr 2016 11:50:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3720020114 for ; Thu, 14 Apr 2016 11:50:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754027AbcDNLsP (ORCPT ); Thu, 14 Apr 2016 07:48:15 -0400 Received: from mail-ob0-f193.google.com ([209.85.214.193]:34359 "EHLO mail-ob0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753708AbcDNLsM (ORCPT ); Thu, 14 Apr 2016 07:48:12 -0400 Received: by mail-ob0-f193.google.com with SMTP id tz8so4828258obc.1; Thu, 14 Apr 2016 04:48:12 -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=xtqSDkYfAZdHZgjsU4PO+ElP5vkyqBTlrGPvfoDjwuQ=; b=Ip//wAKjImXwrckr98QFJgIvgQU4pohk0GLI5CD1kW4aqxcGpYYZ5QgPurpEYMFKaD ziRZC28XOoIkOxuIaIpztArIpGDYVU6w0vcBtXE1OBkipNT+9TfHKOANn4gHmjaJHsnb Y9zB0pAZgdshxkaodTK3lM2Rsq4XpvqxbWPGJXFIBa/uhbgX+L8m80ghwa7YwCWHpGnx OzO1CNpzQMgFxdKOmQxCXSTkrULNhLMaZIzzGTI1p1ggnJSDl5e+r7xZprk6LnFak2YH uiiJ9cnxKm+JntYtvCpWTLhefx7A3/3mhZ/y+251Q1OG3OxkFRVnw8mPB1J8OXqJ5qna 32sA== X-Gm-Message-State: AOPr4FXeaxcChmlnmVwZjCw0zGY9pQWsG9y/6QEjpoXBkKwxB9sPcgZfTXE+UZ/2hk4sLw== X-Received: by 10.182.107.193 with SMTP id he1mr7314476obb.41.1460634492020; Thu, 14 Apr 2016 04:48:12 -0700 (PDT) Received: from localhost ([12.228.154.70]) by smtp.gmail.com with ESMTPSA id xy9sm13441532obc.10.2016.04.14.04.48.11 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Thu, 14 Apr 2016 04:48:11 -0700 (PDT) From: Ming Lei To: Jens Axboe , linux-kernel@vger.kernel.org Cc: linux-block@vger.kernel.org, Christoph Hellwig , Al Viro , Ming Lei , Keith Busch , Jan Kara , Kent Overstreet , "Kirill A. Shutemov" , Mike Snitzer , Tejun Heo , Shaohua Li Subject: [PATCH v4 2/8] block: move two bvec structure into bvec.h Date: Thu, 14 Apr 2016 19:46:55 +0800 Message-Id: <1460634438-26530-3-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1460634438-26530-1-git-send-email-ming.lei@canonical.com> References: <1460634438-26530-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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 | 23 ++++++++++++++++++++++- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/include/linux/bio.h b/include/linux/bio.h index 1c06184..96835a0 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..096efd2 100644 --- a/include/linux/bvec.h +++ b/include/linux/bvec.h @@ -20,7 +20,28 @@ #ifndef __LINUX_BVEC_ITER_H #define __LINUX_BVEC_ITER_H -#include +#include +#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