From patchwork Thu Jun 14 03:32:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 164789 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 E8A16B702D for ; Thu, 14 Jun 2012 13:24:31 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755183Ab2FNDYa (ORCPT ); Wed, 13 Jun 2012 23:24:30 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:64546 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755096Ab2FNDYa (ORCPT ); Wed, 13 Jun 2012 23:24:30 -0400 Received: by dady13 with SMTP id y13so1935499dad.19 for ; Wed, 13 Jun 2012 20:24:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=fS4Owh0z+jy+q1Ri7ZB4qNir+8wPcbtK+Y06VngjCyY=; b=AIv6LTSO7jaaZw7alv8EqFrvh7ypzTFwG+i4cAFuD4FIQDwExFdpCyEzB6zhwZ1Pt9 V2viVZSlwcV+Xu5SEAIFHOtmTWBF4CnTfvcxx7cnZdzddWcPKz1hJiI7sxLWIBYKuMQz oSYGQ97cDKL4slZypkWClHiQEF98p8/X2kVayjwo0GoUfiG0V++DVA5CFa7LRkarThfo aqLKse0oGuggWgbIQ7W4lf75re1ylN0VbDWSlZLWjhk639bok8CT6BuClCm1vb6VgmgM EMuM/U+LcNyjmYTpkgxOicTjsuz/XFYJ447ZRVgg+dy4x6jbB9C17+zxTYKFUqHqcFCY UYag== Received: by 10.68.227.197 with SMTP id sc5mr2982537pbc.58.1339644269862; Wed, 13 Jun 2012 20:24:29 -0700 (PDT) Received: from localhost.localdomain ([182.92.247.2]) by mx.google.com with ESMTPS id gj8sm7915348pbc.39.2012.06.13.20.24.27 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 13 Jun 2012 20:24:29 -0700 (PDT) From: Zheng Liu To: linux-ext4@vger.kernel.org Cc: Tao Ma , Eric Sandeen , Zheng Liu Subject: [RFC][PATCH v2 1/3] ext4: split ext4_file_write into buffered IO and direct IO Date: Thu, 14 Jun 2012 11:32:08 +0800 Message-Id: <1339644730-6204-2-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1339644730-6204-1-git-send-email-wenqing.lz@taobao.com> References: <1339644730-6204-1-git-send-email-wenqing.lz@taobao.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Zheng Liu ext4_file_dio_write is defined in order to split buffered IO and direct IO in ext4. This patch just refactor some stuff in write path. CC: Tao Ma CC: Eric Sandeen Signed-off-by: Zheng Liu --- fs/ext4/file.c | 60 +++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 38 insertions(+), 22 deletions(-) diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 8c7642a..a10dc77 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -90,34 +90,16 @@ ext4_unaligned_aio(struct inode *inode, const struct iovec *iov, } static ssize_t -ext4_file_write(struct kiocb *iocb, const struct iovec *iov, - unsigned long nr_segs, loff_t pos) +ext4_file_dio_write(struct kiocb *iocb, const struct iovec *iov, + unsigned long nr_segs, loff_t pos) { struct inode *inode = iocb->ki_filp->f_path.dentry->d_inode; int unaligned_aio = 0; ssize_t ret; - /* - * If we have encountered a bitmap-format file, the size limit - * is smaller than s_maxbytes, which is for extent-mapped files. - */ - - if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) { - struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); - size_t length = iov_length(iov, nr_segs); - - if ((pos > sbi->s_bitmap_maxbytes || - (pos == sbi->s_bitmap_maxbytes && length > 0))) - return -EFBIG; - - if (pos + length > sbi->s_bitmap_maxbytes) { - nr_segs = iov_shorten((struct iovec *)iov, nr_segs, - sbi->s_bitmap_maxbytes - pos); - } - } else if (unlikely((iocb->ki_filp->f_flags & O_DIRECT) && - !is_sync_kiocb(iocb))) { + if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS) && + !is_sync_kiocb(iocb)) unaligned_aio = ext4_unaligned_aio(inode, iov, nr_segs, pos); - } /* Unaligned direct AIO must be serialized; see comment above */ if (unaligned_aio) { @@ -141,6 +123,40 @@ ext4_file_write(struct kiocb *iocb, const struct iovec *iov, return ret; } +static ssize_t +ext4_file_write(struct kiocb *iocb, const struct iovec *iov, + unsigned long nr_segs, loff_t pos) +{ + struct inode *inode = iocb->ki_filp->f_path.dentry->d_inode; + ssize_t ret; + + /* + * If we have encountered a bitmap-format file, the size limit + * is smaller than s_maxbytes, which is for extent-mapped files. + */ + + if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) { + struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); + size_t length = iov_length(iov, nr_segs); + + if ((pos > sbi->s_bitmap_maxbytes || + (pos == sbi->s_bitmap_maxbytes && length > 0))) + return -EFBIG; + + if (pos + length > sbi->s_bitmap_maxbytes) { + nr_segs = iov_shorten((struct iovec *)iov, nr_segs, + sbi->s_bitmap_maxbytes - pos); + } + } + + if (unlikely(iocb->ki_filp->f_flags & O_DIRECT)) + ret = ext4_file_dio_write(iocb, iov, nr_segs, pos); + else + ret = generic_file_aio_write(iocb, iov, nr_segs, pos); + + return ret; +} + static const struct vm_operations_struct ext4_file_vm_ops = { .fault = filemap_fault, .page_mkwrite = ext4_page_mkwrite,