From patchwork Mon Oct 28 10:53:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Bobrowski X-Patchwork-Id: 1185302 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mbobrowski.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mbobrowski-org.20150623.gappssmtp.com header.i=@mbobrowski-org.20150623.gappssmtp.com header.b="k+V7j4Dt"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 471s563bXdz9sNw for ; Mon, 28 Oct 2019 21:53:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388373AbfJ1KxN (ORCPT ); Mon, 28 Oct 2019 06:53:13 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:44298 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729177AbfJ1KxN (ORCPT ); Mon, 28 Oct 2019 06:53:13 -0400 Received: by mail-pg1-f195.google.com with SMTP id e10so6625223pgd.11 for ; Mon, 28 Oct 2019 03:53:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mbobrowski-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=85uK5SPDrOSgd4/UZbXAWGK0mzidi8Z7PgS+mbnmLLg=; b=k+V7j4Dt1th3d0RcyGq6mbTtakcXti0F639aJaOZNiyvf5bhnkxiuv/lA3kS7KVJDc s1HTJAtb91zYGfsYHaVSk7jHL9NEsMclBo989U3p+vmGMy6wNdAs5WdtOCNJT2VJ/7Wy Vp/su5RO3XTGD4nDTlP2dXgVpFCt2bqmNmh96WX39id8d+uSnfFAGTjvUWyliDxadc9o eWm9l/kmv8AlvkV/cx/NEGpd0/OqkK6GbrlwOOcwPqUaqrya34fIcm13DYIrtiNR6FNE rGl31z99+1Ze0dmMk7UC9znKuAqoniBUHrgVvqCcIBEZXblJRnGPQR2rWuNGPExMcTDF v2cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=85uK5SPDrOSgd4/UZbXAWGK0mzidi8Z7PgS+mbnmLLg=; b=VhezS4rGrKL36Qs8MBeD7QCqMrkBs6zgwZMUdI0dddejqX4D/qpF9awJk/elsQZB9m wWyCmdtypxbElz+wxm9jbc8JJegC6/0YYTYCdn5UJaz+gbAFdKo+zxjgFOROa0YkDU4R wcjCo13IFNmdTwtNkMQhKkIMoU5elLvCQOaAN1NcJK2+zf03LcZid5Kr/A8ivokxq4Uc DYfK2HaH48Up/M9OgA9R3TZNCTiXQqxN/Iib/EMRi+LJq9aTDKcQRz+TGH3NC0gCWMtb LYj79NuSx7ZzjXbpsfKCd+E/BTsdQdwqF70GIW4tU2jjtMXBfzJK7Yv11a8R3T+EV7CL G1EQ== X-Gm-Message-State: APjAAAWN9j08YMc/5j9IXZNziBnLcQ4tqJHgmMcoz0hF/XjBQpyOVtgU tYoeveO5OTvYTmjmMleVqTb+ X-Google-Smtp-Source: APXvYqzHDAKvvAZQN6/3ujQbMxPqjcELczXwIgD9GjZj/TPpo6JcMrbqPbq+ZU9nAm0PMXbH8G8Ekw== X-Received: by 2002:a63:f050:: with SMTP id s16mr19972049pgj.261.1572259992721; Mon, 28 Oct 2019 03:53:12 -0700 (PDT) Received: from poseidon.bobrowski.net (d114-78-127-22.bla803.nsw.optusnet.com.au. [114.78.127.22]) by smtp.gmail.com with ESMTPSA id v68sm10648961pfv.47.2019.10.28.03.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2019 03:53:12 -0700 (PDT) Date: Mon, 28 Oct 2019 21:53:06 +1100 From: Matthew Bobrowski To: tytso@mit.edu, jack@suse.cz, adilger.kernel@dilger.ca Cc: linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, hch@infradead.org, david@fromorbit.com, darrick.wong@oracle.com Subject: [PATCH v6 09/11] ext4: move inode extension check out from ext4_iomap_alloc() Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Lift the inode extension/orphan list handling code out from ext4_iomap_alloc() and apply it within the ext4_dax_write_iter(). Signed-off-by: Matthew Bobrowski Reviewed-by: Jan Kara Reviewed-by: Ritesh Harjani --- fs/ext4/file.c | 24 +++++++++++++++++++++++- fs/ext4/inode.c | 22 ---------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/fs/ext4/file.c b/fs/ext4/file.c index ec54fec96a81..83ef9c9ed208 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -323,6 +323,8 @@ ext4_dax_write_iter(struct kiocb *iocb, struct iov_iter *from) ssize_t ret; size_t count; loff_t offset; + handle_t *handle; + bool extend = false; struct inode *inode = file_inode(iocb->ki_filp); if (!inode_trylock(inode)) { @@ -342,8 +344,28 @@ ext4_dax_write_iter(struct kiocb *iocb, struct iov_iter *from) offset = iocb->ki_pos; count = iov_iter_count(from); + + if (offset + count > EXT4_I(inode)->i_disksize) { + handle = ext4_journal_start(inode, EXT4_HT_INODE, 2); + if (IS_ERR(handle)) { + ret = PTR_ERR(handle); + goto out; + } + + ret = ext4_orphan_add(handle, inode); + if (ret) { + ext4_journal_stop(handle); + goto out; + } + + extend = true; + ext4_journal_stop(handle); + } + ret = dax_iomap_rw(iocb, from, &ext4_iomap_ops); - ret = ext4_handle_inode_extension(inode, offset, ret, count); + + if (extend) + ret = ext4_handle_inode_extension(inode, offset, ret, count); out: inode_unlock(inode); if (ret > 0) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 7c21028760ee..2ca2e6e69344 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3454,7 +3454,6 @@ static int ext4_iomap_alloc(struct inode *inode, struct ext4_map_blocks *map, unsigned int flags) { handle_t *handle; - u8 blkbits = inode->i_blkbits; int ret, dio_credits, retries = 0; /* @@ -3477,28 +3476,7 @@ static int ext4_iomap_alloc(struct inode *inode, struct ext4_map_blocks *map, return PTR_ERR(handle); ret = ext4_map_blocks(handle, inode, map, EXT4_GET_BLOCKS_CREATE_ZERO); - if (ret < 0) - goto journal_stop; - - /* - * If we've allocated blocks beyond EOF, we need to ensure that they're - * truncated if we crash before updating the inode size metadata within - * ext4_iomap_end(). For faults, we don't need to do that (and cannot - * due to orphan list operations needing an inode_lock()). If we happen - * to instantiate blocks beyond EOF, it is because we race with a - * truncate operation, which already has added the inode onto the - * orphan list. - */ - if (!(flags & IOMAP_FAULT) && map->m_lblk + map->m_len > - (i_size_read(inode) + (1 << blkbits) - 1) >> blkbits) { - int err; - - err = ext4_orphan_add(handle, inode); - if (err < 0) - ret = err; - } -journal_stop: ext4_journal_stop(handle); if (ret == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries)) goto retry;