| Message ID | 20211109083309.584081-29-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/29] nvdimm/pmem: move dax_attribute_group from dax to pmem | expand |
On Tue, Nov 09, 2021 at 09:33:08AM +0100, Christoph Hellwig wrote: > 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 <hch@lst.de> Looks ok, Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > 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 >
On Tue, Nov 9, 2021 at 12:34 AM Christoph Hellwig <hch@lst.de> wrote: > > Only build the block based iomap code if CONFIG_BLOCK is set. Currently > that is always the case, but it will change soon. Looks good. Reviewed-by: Dan Williams <dan.j.williams@intel.com>
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
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 <hch@lst.de> --- fs/Kconfig | 4 ++-- fs/iomap/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)