No need to generate virtio_fs.o first and then link to virtiofs.o, just
rename virtio_fs.c to virtiofs.c and remove "virtiofs-y := virtio_fs.o"
in Makefile. Additionally, update MAINTAINERS.
Without this patch:
CC [M] fs/fuse/virtio_fs.o
LD [M] fs/fuse/virtiofs.o
MODPOST modules-only.symvers
GEN Module.symvers
CC [M] fs/fuse/virtiofs.mod.o
LD [M] fs/fuse/virtiofs.ko
With this patch:
CC [M] fs/fuse/virtiofs.o
MODPOST modules-only.symvers
GEN Module.symvers
CC [M] fs/fuse/virtiofs.mod.o
LD [M] fs/fuse/virtiofs.ko
Signed-off-by: Tiezhu Yang <yangtiezhu@xxxxxxxxxxx>
---
MAINTAINERS | 2 +-
fs/fuse/Makefile | 2 --
fs/fuse/{virtio_fs.c => virtiofs.c} | 0
3 files changed, 1 insertion(+), 3 deletions(-)
rename fs/fuse/{virtio_fs.c => virtiofs.c} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 7a2345c..8c2ad7b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -20152,7 +20152,7 @@ L: linux-fsdevel@xxxxxxxxxxxxxxx
S: Supported
W: https://virtio-fs.gitlab.io/
F: Documentation/filesystems/virtiofs.rst
-F: fs/fuse/virtio_fs.c
+F: fs/fuse/virtiofs.c
F: include/uapi/linux/virtio_fs.h
VIRTIO GPIO DRIVER
diff --git a/fs/fuse/Makefile b/fs/fuse/Makefile
index 0c48b35..5f10fe6 100644
--- a/fs/fuse/Makefile
+++ b/fs/fuse/Makefile
@@ -9,5 +9,3 @@ obj-$(CONFIG_VIRTIO_FS) += virtiofs.o
fuse-y := dev.o dir.o file.o inode.o control.o xattr.o acl.o readdir.o ioctl.o
fuse-$(CONFIG_FUSE_DAX) += dax.o
-
-virtiofs-y := virtio_fs.o
diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtiofs.c
similarity index 100%
rename from fs/fuse/virtio_fs.c
rename to fs/fuse/virtiofs.c
--
2.1.0
