Received: by 2002:a05:6a10:8395:0:0:0:0 with SMTP id n21csp105439pxh; Tue, 9 Nov 2021 07:59:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJwOzDsdl4nbEJb5MdS8BiXwZEvE9PtCAeft1a6SbCg+M9qNQkXw59ifQAtRDmQldTN6zEs6 X-Received: by 2002:a05:6e02:20c3:: with SMTP id 3mr5858242ilq.314.1636473570847; Tue, 09 Nov 2021 07:59:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636473570; cv=none; d=google.com; s=arc-20160816; b=gD7xolXq5DXmVJZDBNI2aN9WSAFaGrJetYUoRBiRFmuqcmkGCpuG3gQW9jPUrjwPSY ytfHiNPQlcthBN3/SsDgAlNdiTFOF4ZnVmhMnreCe2AHOL1Ky09qRrkDX8eMQ+Lgdp0u EVhV3U2VY5WQPNnQTVY8xeswVn/BLLKOqQOxAbFKuaOqXJwnQONZSNZRkoDMC/lladgb XxPpdJyMij/cMe1/vTMPPG/jy7/q/NoxxXxJoIWrqmDZV2SG0RtTXQXlvI7rECVeMzZi Hgso6U/YYfxOQyGNuEJQV11zHAfvfMuP/FlpFV2mQNK8y0IdO8zfh4eKqZyM/uv8eoz/ zrXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5N2wtSBKEyzbs+s60mcT1q0r4L87tEtFQFzTKPXH4O4=; b=yVXUMzBmtgMWQKlo+rKLs9Lb/TcEo9W8slUyJ2yVSCLIcNstFJ/sPTPy09H4e4x0pW QSno7c8dN5c64glV9YV1IKO3pRQhtOBy1uReU7jzcvotIb0c9lAUS1fbpqCt1rnCynkl xe0kSGn2B/ufP21jADTtEaYBEdDjRpn9rcI3xQy+K/NyGaKnXDM4CBD8vY66z70D7SwY n2A6+fkdMrvAD57Yt0eZG2ECNUKjOrItedCxwXYy2Ys1K4ENsWNfD96gnP0k+XGLQTk7 CNLpzt8sNQpxy+8KgMSK575AylJRJI2+cRLRB2TSaGVSUQ/UwLrQs6NuHciDH6kWaoJv peAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b="hLY1nZ/k"; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e3si36938197ilu.146.2021.11.09.07.59.16; Tue, 09 Nov 2021 07:59:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b="hLY1nZ/k"; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244300AbhKIIhh (ORCPT + 99 others); Tue, 9 Nov 2021 03:37:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244293AbhKIIgx (ORCPT ); Tue, 9 Nov 2021 03:36:53 -0500 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1FDCC061764; Tue, 9 Nov 2021 00:34:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=5N2wtSBKEyzbs+s60mcT1q0r4L87tEtFQFzTKPXH4O4=; b=hLY1nZ/kodqvEJXK4tgo++ZHpl xATjxHA2n9lCQb+BE/S9F5drb7+1FcEpSUEGk7upLJ2S0sM9gsw0lNRoF+dYHObiZFOyQAhZtDc6k TLBcg6UF+NUa76IhBMApzd6unCBb3P1S3kd7TXu1LRWqQDrpHasqR7az9aE3QPgOS/c2BQTdcO3jd DkzIuMG5A0Bw0zQzDOZywtJ7aOPiBEA+MeevBvJuXHUjBsdzdKfBrkGPgEHvlrHGT5lV1wv/IVjIN Vwu4HAuYXN/tanPC0AZC2u8Tw0b1o3ezXFXkYvoPZ0i47ZFyprqYRyCoNAy6eVjmywqR78Ibghr1Y 5QozPaQw==; Received: from [2001:4bb8:19a:7ee7:fb46:2fe1:8652:d9d4] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1mkMZt-000sEe-DB; Tue, 09 Nov 2021 08:34:02 +0000 From: Christoph Hellwig To: Dan Williams Cc: Mike Snitzer , Ira Weiny , dm-devel@redhat.com, linux-xfs@vger.kernel.org, nvdimm@lists.linux.dev, linux-s390@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-erofs@lists.ozlabs.org, linux-ext4@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: [PATCH 28/29] iomap: build the block based code conditionally Date: Tue, 9 Nov 2021 09:33:08 +0100 Message-Id: <20211109083309.584081-29-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211109083309.584081-1-hch@lst.de> References: <20211109083309.584081-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Only build the block based iomap code if CONFIG_BLOCK is set. Currently that is always the case, but it will change soon. Signed-off-by: Christoph Hellwig --- fs/Kconfig | 4 ++-- fs/iomap/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/Kconfig b/fs/Kconfig index a6313a969bc5f..6d608330a096e 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -15,11 +15,11 @@ config VALIDATE_FS_PARSER Enable this to perform validation of the parameter description for a filesystem when it is registered. -if BLOCK - config FS_IOMAP bool +if BLOCK + source "fs/ext2/Kconfig" source "fs/ext4/Kconfig" source "fs/jbd2/Kconfig" diff --git a/fs/iomap/Makefile b/fs/iomap/Makefile index 4143a3ff89dbc..fc070184b7faa 100644 --- a/fs/iomap/Makefile +++ b/fs/iomap/Makefile @@ -9,9 +9,9 @@ ccflags-y += -I $(srctree)/$(src) # needed for trace events obj-$(CONFIG_FS_IOMAP) += iomap.o iomap-y += trace.o \ - buffered-io.o \ + iter.o +iomap-$(CONFIG_BLOCK) += buffered-io.o \ direct-io.o \ fiemap.o \ - iter.o \ seek.o iomap-$(CONFIG_SWAP) += swapfile.o -- 2.30.2