Browse Source

Move libufs into the kernel as 'ufs'

Signed-off-by: Graham MacDonald <grahamamacdonald@gmail.com>
Graham MacDonald 6 years ago
parent
commit
0629667acc
54 changed files with 46 additions and 91 deletions
  1. 2 1
      sys/src/9/aarch64/cpu.json
  2. 2 1
      sys/src/9/amd64/amd64coreboot.json
  3. 2 1
      sys/src/9/amd64/build.json
  4. 2 1
      sys/src/9/riscv/build.json
  5. 0 0
      sys/src/9/ufs/ffs/ffs_alloc.c
  6. 0 0
      sys/src/9/ufs/ffs/ffs_balloc.c
  7. 0 0
      sys/src/9/ufs/ffs/ffs_extern.h
  8. 0 0
      sys/src/9/ufs/ffs/ffs_inode.c
  9. 0 0
      sys/src/9/ufs/ffs/ffs_rawread.c
  10. 0 0
      sys/src/9/ufs/ffs/ffs_snapshot.c
  11. 0 0
      sys/src/9/ufs/ffs/ffs_softdep.c
  12. 0 0
      sys/src/9/ufs/ffs/ffs_subr.c
  13. 0 0
      sys/src/9/ufs/ffs/ffs_suspend.c
  14. 0 0
      sys/src/9/ufs/ffs/ffs_tables.c
  15. 0 0
      sys/src/9/ufs/ffs/ffs_vfsops.c
  16. 0 0
      sys/src/9/ufs/ffs/ffs_vnops.c
  17. 0 0
      sys/src/9/ufs/ffs/fs.h
  18. 0 0
      sys/src/9/ufs/ffs/softdep.h
  19. 0 0
      sys/src/9/ufs/port-scripts/list-spatch-breakers.sh
  20. 0 0
      sys/src/9/ufs/port-scripts/macros.h
  21. 0 0
      sys/src/9/ufs/port-scripts/null.cocci
  22. 0 0
      sys/src/9/ufs/port-scripts/replace-ids-with-harvey-incs.cocci
  23. 0 0
      sys/src/9/ufs/port-scripts/scalar.cocci
  24. 0 0
      sys/src/9/ufs/port-scripts/strip-includes.cocci
  25. 37 0
      sys/src/9/ufs/ufs.json
  26. 0 0
      sys/src/9/ufs/ufs/README.acls
  27. 0 0
      sys/src/9/ufs/ufs/README.extattr
  28. 0 0
      sys/src/9/ufs/ufs/acl.h
  29. 0 0
      sys/src/9/ufs/ufs/dinode.h
  30. 0 0
      sys/src/9/ufs/ufs/dir.h
  31. 0 0
      sys/src/9/ufs/ufs/dirhash.h
  32. 0 0
      sys/src/9/ufs/ufs/extattr.h
  33. 0 0
      sys/src/9/ufs/ufs/freebsd_util.h
  34. 0 0
      sys/src/9/ufs/ufs/gjournal.h
  35. 0 0
      sys/src/9/ufs/ufs/inode.h
  36. 0 0
      sys/src/9/ufs/ufs/quota.h
  37. 0 0
      sys/src/9/ufs/ufs/ufs_acl.c
  38. 0 0
      sys/src/9/ufs/ufs/ufs_bmap.c
  39. 0 0
      sys/src/9/ufs/ufs/ufs_dirhash.c
  40. 0 0
      sys/src/9/ufs/ufs/ufs_extattr.c
  41. 0 0
      sys/src/9/ufs/ufs/ufs_extern.h
  42. 0 0
      sys/src/9/ufs/ufs/ufs_gjournal.c
  43. 0 0
      sys/src/9/ufs/ufs/ufs_inode.c
  44. 0 0
      sys/src/9/ufs/ufs/ufs_lookup.c
  45. 0 0
      sys/src/9/ufs/ufs/ufs_quota.c
  46. 0 0
      sys/src/9/ufs/ufs/ufs_vfsops.c
  47. 0 0
      sys/src/9/ufs/ufs/ufs_vnops.c
  48. 0 0
      sys/src/9/ufs/ufs/ufsmount.h
  49. 0 0
      sys/src/9/ufs/ufs_harvey.c
  50. 0 0
      sys/src/9/ufs/ufs_harvey.h
  51. 1 2
      sys/src/klibs.json
  52. 0 1
      sys/src/libs.json
  53. 0 42
      sys/src/libufs/klibufs.json
  54. 0 42
      sys/src/libufs/libufs.json

+ 2 - 1
sys/src/9/aarch64/cpu.json

@@ -8,7 +8,8 @@
 		],
 		"IncludeSomeday": [
 			"../ip/ip.json",
-			"../port/port.json"
+			"../port/port.json",
+			"../ufs/ufs.json"
 		],
 		"Kernel": {
 			"Config": {

+ 2 - 1
sys/src/9/amd64/amd64coreboot.json

@@ -7,7 +7,8 @@
 			"core.json",
 			"../386/386.json",
 			"../ip/ip.json",
-			"../port/port.json"
+			"../port/port.json",
+			"../ufs/ufs.json"
 		],
 		"Kernel": {
 			"Config": {

+ 2 - 1
sys/src/9/amd64/build.json

@@ -7,7 +7,8 @@
 			"core.json",
 			"../386/386.json",
 			"../ip/ip.json",
-			"../port/port.json"
+			"../port/port.json",
+			"../ufs/ufs.json"
 		],
 		"Kernel": {
 			"Config": {

+ 2 - 1
sys/src/9/riscv/build.json

@@ -6,7 +6,8 @@
 		"Include": [
 			"core.json",
 			"../ip/ip.json",
-			"../port/port.json"
+			"../port/port.json",
+			"../ufs/ufs.json"
 		],
 		"IncludeSomedayWhenRISCVgetsvirtio": [
 			"../port/port.json"

+ 0 - 0
sys/src/libufs/ffs/ffs_alloc.c → sys/src/9/ufs/ffs/ffs_alloc.c


+ 0 - 0
sys/src/libufs/ffs/ffs_balloc.c → sys/src/9/ufs/ffs/ffs_balloc.c


+ 0 - 0
sys/src/libufs/ffs/ffs_extern.h → sys/src/9/ufs/ffs/ffs_extern.h


+ 0 - 0
sys/src/libufs/ffs/ffs_inode.c → sys/src/9/ufs/ffs/ffs_inode.c


+ 0 - 0
sys/src/libufs/ffs/ffs_rawread.c → sys/src/9/ufs/ffs/ffs_rawread.c


+ 0 - 0
sys/src/libufs/ffs/ffs_snapshot.c → sys/src/9/ufs/ffs/ffs_snapshot.c


+ 0 - 0
sys/src/libufs/ffs/ffs_softdep.c → sys/src/9/ufs/ffs/ffs_softdep.c


+ 0 - 0
sys/src/libufs/ffs/ffs_subr.c → sys/src/9/ufs/ffs/ffs_subr.c


+ 0 - 0
sys/src/libufs/ffs/ffs_suspend.c → sys/src/9/ufs/ffs/ffs_suspend.c


+ 0 - 0
sys/src/libufs/ffs/ffs_tables.c → sys/src/9/ufs/ffs/ffs_tables.c


+ 0 - 0
sys/src/libufs/ffs/ffs_vfsops.c → sys/src/9/ufs/ffs/ffs_vfsops.c


+ 0 - 0
sys/src/libufs/ffs/ffs_vnops.c → sys/src/9/ufs/ffs/ffs_vnops.c


+ 0 - 0
sys/src/libufs/ffs/fs.h → sys/src/9/ufs/ffs/fs.h


+ 0 - 0
sys/src/libufs/ffs/softdep.h → sys/src/9/ufs/ffs/softdep.h


+ 0 - 0
sys/src/libufs/port-scripts/list-spatch-breakers.sh → sys/src/9/ufs/port-scripts/list-spatch-breakers.sh


+ 0 - 0
sys/src/libufs/port-scripts/macros.h → sys/src/9/ufs/port-scripts/macros.h


+ 0 - 0
sys/src/libufs/port-scripts/null.cocci → sys/src/9/ufs/port-scripts/null.cocci


+ 0 - 0
sys/src/libufs/port-scripts/replace-ids-with-harvey-incs.cocci → sys/src/9/ufs/port-scripts/replace-ids-with-harvey-incs.cocci


+ 0 - 0
sys/src/libufs/port-scripts/scalar.cocci → sys/src/9/ufs/port-scripts/scalar.cocci


+ 0 - 0
sys/src/libufs/port-scripts/strip-includes.cocci → sys/src/9/ufs/port-scripts/strip-includes.cocci


+ 37 - 0
sys/src/9/ufs/ufs.json

@@ -0,0 +1,37 @@
+{
+	"ufs": {
+		"Cflags": [
+		    "-fasm",
+		    "-I",
+		    "../ufs/ffs",
+		    "-I",
+		    "../ufs/ufs"
+		],
+		"#SourceFiles": [
+			"../ufs/ffs/ffs_alloc.c",
+			"../ufs/ffs/ffs_balloc.c",
+			"../ufs/ffs/ffs_inode.c",
+			"../ufs/ffs/ffs_rawread.c",
+			"../ufs/ffs/ffs_snapshot.c",
+			"../ufs/ffs/ffs_softdep.c",
+			"../ufs/ffs/ffs_subr.c",
+			"../ufs/ffs/ffs_suspend.c",
+			"../ufs/ffs/ffs_vnops.c",
+			"../ufs/ufs/ufs_acl.c",
+			"../ufs/ufs/ufs_bmap.c",
+			"../ufs/ufs/ufs_dirhash.c",
+			"../ufs/ufs/ufs_extattr.c",
+			"../ufs/ufs/ufs_gjournal.c",
+			"../ufs/ufs/ufs_inode.c",
+			"../ufs/ufs/ufs_lookup.c",
+			"../ufs/ufs/ufs_quota.c",
+			"../ufs/ufs/ufs_vfsops.c",
+			"../ufs/ufs/ufs_vnops.c"
+		],
+		"SourceFiles": [
+			"../ufs/ffs/ffs_tables.c",
+			"../ufs/ffs/ffs_vfsops.c",
+			"../ufs/ufs_harvey.c"
+		]
+	}
+}

+ 0 - 0
sys/src/libufs/ufs/README.acls → sys/src/9/ufs/ufs/README.acls


+ 0 - 0
sys/src/libufs/ufs/README.extattr → sys/src/9/ufs/ufs/README.extattr


+ 0 - 0
sys/src/libufs/ufs/acl.h → sys/src/9/ufs/ufs/acl.h


+ 0 - 0
sys/src/libufs/ufs/dinode.h → sys/src/9/ufs/ufs/dinode.h


+ 0 - 0
sys/src/libufs/ufs/dir.h → sys/src/9/ufs/ufs/dir.h


+ 0 - 0
sys/src/libufs/ufs/dirhash.h → sys/src/9/ufs/ufs/dirhash.h


+ 0 - 0
sys/src/libufs/ufs/extattr.h → sys/src/9/ufs/ufs/extattr.h


+ 0 - 0
sys/src/libufs/ufs/freebsd_util.h → sys/src/9/ufs/ufs/freebsd_util.h


+ 0 - 0
sys/src/libufs/ufs/gjournal.h → sys/src/9/ufs/ufs/gjournal.h


+ 0 - 0
sys/src/libufs/ufs/inode.h → sys/src/9/ufs/ufs/inode.h


+ 0 - 0
sys/src/libufs/ufs/quota.h → sys/src/9/ufs/ufs/quota.h


+ 0 - 0
sys/src/libufs/ufs/ufs_acl.c → sys/src/9/ufs/ufs/ufs_acl.c


+ 0 - 0
sys/src/libufs/ufs/ufs_bmap.c → sys/src/9/ufs/ufs/ufs_bmap.c


+ 0 - 0
sys/src/libufs/ufs/ufs_dirhash.c → sys/src/9/ufs/ufs/ufs_dirhash.c


+ 0 - 0
sys/src/libufs/ufs/ufs_extattr.c → sys/src/9/ufs/ufs/ufs_extattr.c


+ 0 - 0
sys/src/libufs/ufs/ufs_extern.h → sys/src/9/ufs/ufs/ufs_extern.h


+ 0 - 0
sys/src/libufs/ufs/ufs_gjournal.c → sys/src/9/ufs/ufs/ufs_gjournal.c


+ 0 - 0
sys/src/libufs/ufs/ufs_inode.c → sys/src/9/ufs/ufs/ufs_inode.c


+ 0 - 0
sys/src/libufs/ufs/ufs_lookup.c → sys/src/9/ufs/ufs/ufs_lookup.c


+ 0 - 0
sys/src/libufs/ufs/ufs_quota.c → sys/src/9/ufs/ufs/ufs_quota.c


+ 0 - 0
sys/src/libufs/ufs/ufs_vfsops.c → sys/src/9/ufs/ufs/ufs_vfsops.c


+ 0 - 0
sys/src/libufs/ufs/ufs_vnops.c → sys/src/9/ufs/ufs/ufs_vnops.c


+ 0 - 0
sys/src/libufs/ufs/ufsmount.h → sys/src/9/ufs/ufs/ufsmount.h


+ 0 - 0
sys/src/libufs/ufs_harvey.c → sys/src/9/ufs/ufs_harvey.c


+ 0 - 0
sys/src/libufs/ufs_harvey.h → sys/src/9/ufs/ufs_harvey.h


+ 1 - 2
sys/src/klibs.json

@@ -6,8 +6,7 @@
 			"/sys/src/libdraw/klibdraw.json",
 			"/sys/src/libmemdraw/klibmemdraw.json",
 			"/sys/src/libmemlayer/klibmemlayer.json",
-			"/sys/src/libsec/klibsec.json",
-			"/sys/src/libufs/klibufs.json"
+			"/sys/src/libsec/klibsec.json"
 		]
 	}
 }

+ 0 - 1
sys/src/libs.json

@@ -33,7 +33,6 @@
 			"/sys/src/libstdio/libstdio.json",
 			"/sys/src/libthread/libthread.json",
 			"/sys/src/libusb",
-			"/sys/src/libufs/libufs.json",
 			"/sys/src/libventi/libventi.json"
 		]
 	}

+ 0 - 42
sys/src/libufs/klibufs.json

@@ -1,42 +0,0 @@
-{
-	"Kernellibufs": {
-		"Cflags": [
-		    "-fasm",
-		    "-I",
-		    "ffs",
-		    "-I",
-		    "ufs"
-		],
-		"Include": [
-			"/$ARCH/include/klib.json"
-		],
-		"Install": "/$ARCH/lib/",
-		"Library": "klibufs.a",
-		"#SourceFiles": [
-			"ffs/ffs_alloc.c",
-			"ffs/ffs_balloc.c",
-			"ffs/ffs_inode.c",
-			"ffs/ffs_rawread.c",
-			"ffs/ffs_snapshot.c",
-			"ffs/ffs_softdep.c",
-			"ffs/ffs_subr.c",
-			"ffs/ffs_suspend.c",
-			"ffs/ffs_vnops.c",
-			"ufs/ufs_acl.c",
-			"ufs/ufs_bmap.c",
-			"ufs/ufs_dirhash.c",
-			"ufs/ufs_extattr.c",
-			"ufs/ufs_gjournal.c",
-			"ufs/ufs_inode.c",
-			"ufs/ufs_lookup.c",
-			"ufs/ufs_quota.c",
-			"ufs/ufs_vfsops.c",
-			"ufs/ufs_vnops.c"
-		],
-		"SourceFiles": [
-			"ffs/ffs_tables.c",
-			"ffs/ffs_vfsops.c",
-			"ufs_harvey.c"
-		]
-	}
-}

+ 0 - 42
sys/src/libufs/libufs.json

@@ -1,42 +0,0 @@
-{
-	"Libufs": {
-		"Cflags": [
-		    "-fasm",
-		    "-I",
-		    "ffs",
-		    "-I",
-		    "ufs"
-		],
-		"Include": [
-			"../lib.json"
-		],
-		"Install": "/$ARCH/lib/",
-		"Library": "libufs.a",
-		"#SourceFiles": [
-			"ffs/ffs_alloc.c",
-			"ffs/ffs_balloc.c",
-			"ffs/ffs_inode.c",
-			"ffs/ffs_rawread.c",
-			"ffs/ffs_snapshot.c",
-			"ffs/ffs_softdep.c",
-			"ffs/ffs_subr.c",
-			"ffs/ffs_suspend.c",
-			"ffs/ffs_vnops.c",
-			"ufs/ufs_acl.c",
-			"ufs/ufs_bmap.c",
-			"ufs/ufs_dirhash.c",
-			"ufs/ufs_extattr.c",
-			"ufs/ufs_gjournal.c",
-			"ufs/ufs_inode.c",
-			"ufs/ufs_lookup.c",
-			"ufs/ufs_quota.c",
-			"ufs/ufs_vfsops.c",
-			"ufs/ufs_vnops.c"
-		],
-		"SourceFiles": [
-			"ffs/ffs_tables.c",
-			"ffs/ffs_vfsops.c",
-			"ufs_harvey.c"
-		]
-	}
-}