From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87542CA9EC2 for ; Mon, 28 Oct 2019 20:36:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5B1CE20830 for ; Mon, 28 Oct 2019 20:36:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=mbobrowski-org.20150623.gappssmtp.com header.i=@mbobrowski-org.20150623.gappssmtp.com header.b="f3VmmWdd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387620AbfJ1Ugy (ORCPT ); Mon, 28 Oct 2019 16:36:54 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:33070 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726816AbfJ1Ugy (ORCPT ); Mon, 28 Oct 2019 16:36:54 -0400 Received: by mail-pf1-f195.google.com with SMTP id c184so7731488pfb.0 for ; Mon, 28 Oct 2019 13:36:49 -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=e6PsAZcqr3oYV/o2k3hxPPelLIbfYqfer30lzZ2BFcY=; b=f3VmmWddgpdgU1E2UCNM6eeKOTtiJc5S/WhchNMLI5+X2wZnW9VV7dIuMrLtVqgbCp 3BgMn1u5QY7aawnMiX4U2V3+csgO1ddnLgMGs45jvCPBhTUYdLws5/INzy0HXDlnfXzs cCecLkqEbQog15uiini90A1DiwZwB6YEsntBIWrvC8Z+JOxiDDMI4s/xaZwf2/VRisSP g1XL9Cs7hrDb9GXQtGrAHu5wTlTR8H7Uby5nTi4fWqesFvXbqLywvWw8fh4Kd9XteNgB rbVEl0TKeDnR3C69L9uYHObsb29GV6b2XZgyHuIaYInOIEAFh7Yd5Z9uHavd4omQm3nZ aIHA== 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=e6PsAZcqr3oYV/o2k3hxPPelLIbfYqfer30lzZ2BFcY=; b=aFiEvyhg65JlJEKb1Wf1oXKviVAOnn5MiC8ujMu11zc5lwX8bQibbWBMRUzIngs+fo JWtatFyV4O+MO+5mxqXd2IH1hItYd32hKAN6PhM24w5wGp1sEZETyvskJgTF+evJfQBi sJ1ux9jlCRef1D5PlysA8xi0JwU4q+dWA3yjL+bBNb6h5e9n2Mwk1hl6xXPQ92QrLIdo 0lg4QlNO2KhVVhgARNeZnb86CqH8aSN/oUPl0sTfPqPbaOwe3sQat6zzAXz2jcKq1nbv iR7cDsxhjFt8T36wYBgIFFpk3IFLTalLvynIxq/r2ZIAz6VhTTFX5pCuu5B9KGyJB8RO U8hQ== X-Gm-Message-State: APjAAAWqJkJxwft4J027wkEh8ZFgWYb83S4MMqLv3R2rFWTzRt1ECUwK iFgO6daT/BRrzdrwPe1oT0iC X-Google-Smtp-Source: APXvYqy9yZPBfvOSWcmpa0LDyHMOrbfsD6MZFeQ64kJK2fev3biiGJx2YcU9F+nJP8Q8l8tAG03+ow== X-Received: by 2002:a62:7c91:: with SMTP id x139mr13910960pfc.119.1572295008612; Mon, 28 Oct 2019 13:36:48 -0700 (PDT) Received: from bobrowski ([110.232.114.101]) by smtp.gmail.com with ESMTPSA id c14sm12887423pfm.179.2019.10.28.13.36.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2019 13:36:47 -0700 (PDT) Date: Tue, 29 Oct 2019 07:36:41 +1100 From: Matthew Bobrowski To: "Darrick J. Wong" Cc: tytso@mit.edu, jack@suse.cz, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, hch@infradead.org, david@fromorbit.com Subject: Re: [PATCH v6 04/11] ext4: move set iomap routines into a separate helper ext4_set_iomap() Message-ID: <20191028203641.GA25021@bobrowski> References: <36c0b0028215ed0a39697512054f3fa4799b0701.1572255425.git.mbobrowski@mbobrowski.org> <20191028170348.GA15203@magnolia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191028170348.GA15203@magnolia> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Mon, Oct 28, 2019 at 10:03:48AM -0700, Darrick J. Wong wrote: > On Mon, Oct 28, 2019 at 09:51:31PM +1100, Matthew Bobrowski wrote: > > +static void ext4_set_iomap(struct inode *inode, struct iomap *iomap, > > + struct ext4_map_blocks *map, loff_t offset, > > + loff_t length) > > +{ > > + u8 blkbits = inode->i_blkbits; > > + > > + /* > > + * Writes that span EOF might trigger an I/O size update on completion, > > + * so consider them to be dirty for the purpose of O_DSYNC, even if > > + * there is no other metadata changes being made or are pending. > > + */ > > + iomap->flags = 0; > > + if (ext4_inode_datasync_dirty(inode) || > > + offset + length > i_size_read(inode)) > > + iomap->flags |= IOMAP_F_DIRTY; > > + > > + if (map->m_flags & EXT4_MAP_NEW) > > + iomap->flags |= IOMAP_F_NEW; > > + > > + iomap->bdev = inode->i_sb->s_bdev; > > + iomap->dax_dev = EXT4_SB(inode->i_sb)->s_daxdev; > > + iomap->offset = (u64) map->m_lblk << blkbits; > > + iomap->length = (u64) map->m_len << blkbits; > > + > > + if (map->m_flags & (EXT4_MAP_MAPPED | EXT4_MAP_UNWRITTEN)) { > > /me wonders if this would be easier to follow if it was less indenty: > > /* > * > */ > if (m_flags & EXT4_MAP_UNWRITTEN) { > iomap->type = IOMAP_UNWRITTEN; > iomap->addr = ... > } else if (m_flags & EXT4_MAP_MAPPED) { > iomap->type = IOAMP_MAPPED; > iomap->addr = ... > } else { > iomap->type = IOMAP_HOLE; > iomap->addr = IOMAP_NULL_ADDR; > } > > Rather than double-checking m_flags? Yeah, you're right. The extra checks and levels of indentation aren't really necessary and can be simplified further, as you've suggested above. Thanks for looking over this for me. /me adds this to the TODO for v7. ----