diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 50239a17502c..c0d091fdc6ee 100755
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -122,6 +122,4 @@ source "drivers/staging/pi433/Kconfig"
 
 source "drivers/staging/sti/Kconfig"
 
-source "drivers/staging/erofs/Kconfig"
-
 endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index d876255db7c0..1661933ad1a3 100755
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -52,4 +52,3 @@ obj-$(CONFIG_CRYPTO_DEV_CCREE)	+= ccree/
 obj-$(CONFIG_DRM_VBOXVIDEO)	+= vboxvideo/
 obj-$(CONFIG_PI433)		+= pi433/
 obj-$(CONFIG_SEC_STI)		+= sti/
-obj-$(CONFIG_EROFS_FS)          += erofs/
diff --git a/fs/Kconfig b/fs/Kconfig
index e7734a23cfc4..134f7002e41e 100755
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -257,6 +257,7 @@ source "fs/pstore/Kconfig"
 source "fs/sysv/Kconfig"
 source "fs/ufs/Kconfig"
 source "fs/exofs/Kconfig"
+source "fs/erofs/Kconfig"
 
 endif # MISC_FILESYSTEMS
 
diff --git a/fs/Makefile b/fs/Makefile
index a6751ac029a0..01b2d16220f7 100755
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -135,3 +135,4 @@ obj-y				+= exofs/ # Multiple modules
 obj-$(CONFIG_CEPH_FS)		+= ceph/
 obj-$(CONFIG_PSTORE)		+= pstore/
 obj-$(CONFIG_EFIVAR_FS)		+= efivarfs/
+obj-$(CONFIG_EROFS_FS)		+= erofs/
diff --git a/drivers/staging/erofs/Kconfig b/fs/erofs/Kconfig
similarity index 100%
rename from drivers/staging/erofs/Kconfig
rename to fs/erofs/Kconfig
diff --git a/drivers/staging/erofs/Makefile b/fs/erofs/Makefile
similarity index 100%
rename from drivers/staging/erofs/Makefile
rename to fs/erofs/Makefile
diff --git a/drivers/staging/erofs/TODO b/fs/erofs/TODO
similarity index 100%
rename from drivers/staging/erofs/TODO
rename to fs/erofs/TODO
diff --git a/drivers/staging/erofs/compress.h b/fs/erofs/compress.h
similarity index 100%
rename from drivers/staging/erofs/compress.h
rename to fs/erofs/compress.h
diff --git a/drivers/staging/erofs/data.c b/fs/erofs/data.c
similarity index 100%
rename from drivers/staging/erofs/data.c
rename to fs/erofs/data.c
diff --git a/drivers/staging/erofs/decompressor.c b/fs/erofs/decompressor.c
similarity index 100%
rename from drivers/staging/erofs/decompressor.c
rename to fs/erofs/decompressor.c
diff --git a/drivers/staging/erofs/dir.c b/fs/erofs/dir.c
similarity index 100%
rename from drivers/staging/erofs/dir.c
rename to fs/erofs/dir.c
diff --git a/drivers/staging/erofs/erofs_fs.h b/fs/erofs/erofs_fs.h
similarity index 100%
rename from drivers/staging/erofs/erofs_fs.h
rename to fs/erofs/erofs_fs.h
diff --git a/drivers/staging/erofs/inode.c b/fs/erofs/inode.c
similarity index 100%
rename from drivers/staging/erofs/inode.c
rename to fs/erofs/inode.c
diff --git a/drivers/staging/erofs/internal.h b/fs/erofs/internal.h
similarity index 100%
rename from drivers/staging/erofs/internal.h
rename to fs/erofs/internal.h
diff --git a/drivers/staging/erofs/namei.c b/fs/erofs/namei.c
similarity index 100%
rename from drivers/staging/erofs/namei.c
rename to fs/erofs/namei.c
diff --git a/drivers/staging/erofs/super.c b/fs/erofs/super.c
similarity index 100%
rename from drivers/staging/erofs/super.c
rename to fs/erofs/super.c
diff --git a/drivers/staging/erofs/tagptr.h b/fs/erofs/tagptr.h
similarity index 100%
rename from drivers/staging/erofs/tagptr.h
rename to fs/erofs/tagptr.h
diff --git a/drivers/staging/erofs/utils.c b/fs/erofs/utils.c
similarity index 100%
rename from drivers/staging/erofs/utils.c
rename to fs/erofs/utils.c
diff --git a/drivers/staging/erofs/xattr.c b/fs/erofs/xattr.c
similarity index 100%
rename from drivers/staging/erofs/xattr.c
rename to fs/erofs/xattr.c
diff --git a/drivers/staging/erofs/xattr.h b/fs/erofs/xattr.h
similarity index 100%
rename from drivers/staging/erofs/xattr.h
rename to fs/erofs/xattr.h
diff --git a/drivers/staging/erofs/zdata.c b/fs/erofs/zdata.c
similarity index 100%
rename from drivers/staging/erofs/zdata.c
rename to fs/erofs/zdata.c
diff --git a/drivers/staging/erofs/zdata.h b/fs/erofs/zdata.h
similarity index 100%
rename from drivers/staging/erofs/zdata.h
rename to fs/erofs/zdata.h
diff --git a/drivers/staging/erofs/zmap.c b/fs/erofs/zmap.c
similarity index 100%
rename from drivers/staging/erofs/zmap.c
rename to fs/erofs/zmap.c
diff --git a/drivers/staging/erofs/zpvec.h b/fs/erofs/zpvec.h
similarity index 100%
rename from drivers/staging/erofs/zpvec.h
rename to fs/erofs/zpvec.h