diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-23 20:33:41 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-23 20:33:41 +0200 |
commit | c4728cfbed0f54eacc21138c99da2a91895c8c5a (patch) | |
tree | 61e9ed33dd81da4e5ea9c485964ea9214a6c8b10 /fs/Makefile | |
parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
parent | vfs: move the generic write and copy checks out of mm (diff) | |
download | linux-c4728cfbed0f54eacc21138c99da2a91895c8c5a.tar.xz linux-c4728cfbed0f54eacc21138c99da2a91895c8c5a.zip |
Merge tag 'vfs-5.10-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull clone/dedupe/remap code refactoring from Darrick Wong:
"Move the generic file range remap (aka reflink and dedupe) functions
out of mm/filemap.c and fs/read_write.c and into fs/remap_range.c to
reduce clutter in the first two files"
* tag 'vfs-5.10-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
vfs: move the generic write and copy checks out of mm
vfs: move the remap range helpers to remap_range.c
vfs: move generic_remap_checks out of mm
Diffstat (limited to 'fs/Makefile')
-rw-r--r-- | fs/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/Makefile b/fs/Makefile index 7bb2a05fda1f..999d1a23f036 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -14,7 +14,7 @@ obj-y := open.o read_write.o file_table.o super.o \ pnode.o splice.o sync.o utimes.o d_path.o \ stack.o fs_struct.o statfs.o fs_pin.o nsfs.o \ fs_types.o fs_context.o fs_parser.o fsopen.o init.o \ - kernel_read_file.o + kernel_read_file.o remap_range.o ifeq ($(CONFIG_BLOCK),y) obj-y += buffer.o block_dev.o direct-io.o mpage.o |