From patchwork Thu Sep 13 15:01:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Monakhov X-Patchwork-Id: 183641 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 369E22C008B for ; Fri, 14 Sep 2012 01:01:25 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754532Ab2IMPBX (ORCPT ); Thu, 13 Sep 2012 11:01:23 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]:45957 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757842Ab2IMPBV (ORCPT ); Thu, 13 Sep 2012 11:01:21 -0400 Received: by lbbgj3 with SMTP id gj3so2024074lbb.19 for ; Thu, 13 Sep 2012 08:01:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=uEG2dH4MrJ2/nbrWCt/vBRcDB4IHeo8ouw+uvH2FkMY=; b=0OXG6J9ejdl0FmBxXFiNsaDS6TA6BdqtJUNFuThmyXRdPDlPFDfj74QUlw5p2Ni7/O BlVLFbXQtpnWaHwYWPww91gtjmr6AmfwfBMBT3ugtn9ZdZ/phWeOOMPKfC8O8EDEEja3 mZaPdIXuam0bUSu3SrvUZvDsl4UyHbuNzmwjrtzOVuvlq/5Q7fnC78YRxrBuv9tiFMyO UA1pxBXb2W+IO+phrh5Afd52exGN3HU9LIs2YkBOIsbP25OuqR662ImWjbZpeJ6TsM5R easY+HB0dWakMTpywLdyMyOjHTx+sVaazTxImVgu7VcvVNZoXEx0YFKUkOtxas3qOzc5 bQFQ== Received: by 10.112.38.163 with SMTP id h3mr1016372lbk.130.1347548480395; Thu, 13 Sep 2012 08:01:20 -0700 (PDT) Received: from smtp.gmail.com (swsoft-msk-nat.sw.ru. [195.214.232.10]) by mx.google.com with ESMTPS id bc2sm6225595lbb.3.2012.09.13.08.01.19 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 13 Sep 2012 08:01:19 -0700 (PDT) From: Dmitry Monakhov To: linux-ext4@vger.kernel.org Cc: tytso@mit.edu, jack@suse.cz, wenqing.lz@taobao.com, Dmitry Monakhov Subject: [PATCH 1/9] ext4: ext4_inode_info diet Date: Thu, 13 Sep 2012 19:01:06 +0400 Message-Id: <1347548474-31897-2-git-send-email-dmonakhov@openvz.org> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1347548474-31897-1-git-send-email-dmonakhov@openvz.org> References: <1347548474-31897-1-git-send-email-dmonakhov@openvz.org> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Generic inode has unused i_private pointer which may be used as cur_aio_dio storage. TODO: If cur_aio_dio will be passed as an argument to get_block_t this allow to have concurent AIO_DIO requests. Reviewed-by: Zheng Liu Signed-off-by: Dmitry Monakhov --- fs/ext4/ext4.h | 5 +++-- fs/ext4/extents.c | 4 ++-- fs/ext4/inode.c | 6 +++--- fs/ext4/super.c | 1 - 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index f9024a6..b3f3c55 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -912,8 +912,6 @@ struct ext4_inode_info { struct list_head i_completed_io_list; spinlock_t i_completed_io_lock; atomic_t i_ioend_count; /* Number of outstanding io_end structs */ - /* current io_end structure for async DIO write*/ - ext4_io_end_t *cur_aio_dio; atomic_t i_aiodio_unwritten; /* Nr. of inflight conversions pending */ spinlock_t i_block_reservation_lock; @@ -929,6 +927,9 @@ struct ext4_inode_info { __u32 i_csum_seed; }; +/* current io_end structure for async DIO write */ +#define EXT4_CUR_AIO_DIO(inode) (inode)->i_private + /* * File system states */ diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 10f0afd..e993879 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -3644,7 +3644,7 @@ ext4_ext_handle_uninitialized_extents(handle_t *handle, struct inode *inode, { int ret = 0; int err = 0; - ext4_io_end_t *io = EXT4_I(inode)->cur_aio_dio; + ext4_io_end_t *io = (ext4_io_end_t*) EXT4_CUR_AIO_DIO(inode); ext_debug("ext4_ext_handle_uninitialized_extents: inode %lu, logical " "block %llu, max_blocks %u, flags %x, allocated %u\n", @@ -3902,7 +3902,7 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode, unsigned int allocated = 0, offset = 0; unsigned int allocated_clusters = 0; struct ext4_allocation_request ar; - ext4_io_end_t *io = EXT4_I(inode)->cur_aio_dio; + ext4_io_end_t *io = (ext4_io_end_t*) EXT4_CUR_AIO_DIO(inode); ext4_lblk_t cluster_offset; ext_debug("blocks %u/%u requested for inode %lu\n", diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index d12d30e..202ae3f 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3060,7 +3060,7 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb, * hook to the iocb. */ iocb->private = NULL; - EXT4_I(inode)->cur_aio_dio = NULL; + EXT4_CUR_AIO_DIO(inode) = NULL; if (!is_sync_kiocb(iocb)) { ext4_io_end_t *io_end = ext4_init_io_end(inode, GFP_NOFS); @@ -3077,7 +3077,7 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb, * is a unwritten extents needs to be converted * when IO is completed. */ - EXT4_I(inode)->cur_aio_dio = iocb->private; + EXT4_CUR_AIO_DIO(inode) = iocb->private; } if (overwrite) @@ -3097,7 +3097,7 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb, NULL, DIO_LOCKING); if (iocb->private) - EXT4_I(inode)->cur_aio_dio = NULL; + EXT4_CUR_AIO_DIO(inode) = NULL; /* * The io_end structure takes a reference to the inode, * that structure needs to be destroyed and the diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 4a7092b..a6904b3 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -967,7 +967,6 @@ static struct inode *ext4_alloc_inode(struct super_block *sb) ei->jinode = NULL; INIT_LIST_HEAD(&ei->i_completed_io_list); spin_lock_init(&ei->i_completed_io_lock); - ei->cur_aio_dio = NULL; ei->i_sync_tid = 0; ei->i_datasync_tid = 0; atomic_set(&ei->i_ioend_count, 0);