summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/mtree/BSD.include.dist2
-rw-r--r--include/Makefile4
-rw-r--r--sbin/geom/class/Makefile1
-rw-r--r--sys/conf/NOTES4
-rw-r--r--sys/conf/files3
-rw-r--r--sys/conf/options4
-rw-r--r--sys/modules/geom/Makefile1
-rw-r--r--sys/modules/ufs/Makefile2
8 files changed, 18 insertions, 3 deletions
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index f17cf1c..d1b2558 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -108,6 +108,8 @@
..
gate
..
+ journal
+ ..
label
..
mirror
diff --git a/include/Makefile b/include/Makefile
index cad04d9..77a34f9 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -45,8 +45,8 @@ LSUBDIRS= cam/scsi \
fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \
${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \
fs/unionfs \
- geom/cache geom/concat geom/eli geom/gate geom/label geom/mirror \
- geom/nop geom/raid3 geom/shsec geom/stripe \
+ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
+ geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe \
isofs/cd9660 \
netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \
netgraph/atm netgraph/netflow \
diff --git a/sbin/geom/class/Makefile b/sbin/geom/class/Makefile
index 9c78e16..7adfe5e 100644
--- a/sbin/geom/class/Makefile
+++ b/sbin/geom/class/Makefile
@@ -7,6 +7,7 @@ SUBDIR+=concat
.if ${MK_OPENSSL} != "no"
SUBDIR+=eli
.endif
+SUBDIR+=journal
SUBDIR+=label
SUBDIR+=mirror
SUBDIR+=nop
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 17dde3b..470c15f 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -130,6 +130,7 @@ options GEOM_ELI # Disk encryption.
options GEOM_FOX # Redundant path mitigation
options GEOM_GATE # Userland services.
options GEOM_GPT # GPT partitioning
+options GEOM_JOURNAL # Journaling.
options GEOM_LABEL # Providers labelization.
options GEOM_MBR # DOS/MBR partitioning
options GEOM_MIRROR # Disk mirroring.
@@ -882,6 +883,9 @@ options UFS_ACL
# directories at the expense of some memory.
options UFS_DIRHASH
+# Gjournal-based UFS journaling support.
+options UFS_GJOURNAL
+
# Make space in the kernel for a root filesystem on a md device.
# Define to the number of kilobytes to reserve for the filesystem.
options MD_ROOT_SIZE=10
diff --git a/sys/conf/files b/sys/conf/files
index 58c7011..0af0998 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1195,6 +1195,8 @@ geom/geom_sunlabel.c optional geom_sunlabel
geom/geom_sunlabel_enc.c optional geom_sunlabel
geom/geom_vfs.c standard
geom/geom_vol_ffs.c optional geom_vol
+geom/journal/g_journal.c optional geom_journal
+geom/journal/g_journal_ufs.c optional geom_journal
geom/label/g_label.c optional geom_label
geom/label/g_label_ext2fs.c optional geom_label
geom/label/g_label_iso9660.c optional geom_label
@@ -1952,6 +1954,7 @@ ufs/ufs/ufs_acl.c optional ffs
ufs/ufs/ufs_bmap.c optional ffs
ufs/ufs/ufs_dirhash.c optional ffs
ufs/ufs/ufs_extattr.c optional ffs
+ufs/ufs/ufs_gjournal.c optional ffs
ufs/ufs/ufs_inode.c optional ffs
ufs/ufs/ufs_lookup.c optional ffs
ufs/ufs/ufs_quota.c optional ffs
diff --git a/sys/conf/options b/sys/conf/options
index 123cee8..e3e3bd3 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -83,6 +83,7 @@ GEOM_ELI opt_geom.h
GEOM_FOX opt_geom.h
GEOM_GATE opt_geom.h
GEOM_GPT opt_geom.h
+GEOM_JOURNAL opt_geom.h
GEOM_LABEL opt_geom.h
GEOM_MBR opt_geom.h
GEOM_MIRROR opt_geom.h
@@ -241,6 +242,9 @@ UFS_EXTATTR_AUTOSTART opt_ufs.h
# Enable fast hash lookups for large directories on UFS-based filesystems.
UFS_DIRHASH opt_ufs.h
+# Enable gjournal-based UFS journal.
+UFS_GJOURNAL opt_ufs.h
+
# The below sentence is not in English, and neither is this one.
# We plan to remove the static dependences above, with a
# <filesystem>_ROOT option to control if it usable as root. This list
diff --git a/sys/modules/geom/Makefile b/sys/modules/geom/Makefile
index d509105..463529d 100644
--- a/sys/modules/geom/Makefile
+++ b/sys/modules/geom/Makefile
@@ -10,6 +10,7 @@ SUBDIR= geom_apple \
geom_fox \
geom_gate \
geom_gpt \
+ geom_journal \
geom_label \
geom_mbr \
geom_mirror \
diff --git a/sys/modules/ufs/Makefile b/sys/modules/ufs/Makefile
index b216b80..6b471fd 100644
--- a/sys/modules/ufs/Makefile
+++ b/sys/modules/ufs/Makefile
@@ -6,7 +6,7 @@ KMOD= ufs
SRCS= opt_ddb.h opt_directio.h opt_ffs.h opt_ffs_broken_fixme.h opt_mac.h \
opt_quota.h opt_suiddir.h opt_ufs.h \
vnode_if.h ufs_acl.c ufs_bmap.c ufs_dirhash.c ufs_extattr.c \
- ufs_inode.c ufs_lookup.c ufs_quota.c ufs_vfsops.c \
+ ufs_gjournal.c ufs_inode.c ufs_lookup.c ufs_quota.c ufs_vfsops.c \
ufs_vnops.c ffs_alloc.c ffs_balloc.c ffs_inode.c ffs_snapshot.c \
ffs_softdep.c ffs_subr.c ffs_tables.c ffs_vfsops.c ffs_vnops.c
OpenPOWER on IntegriCloud