From df263cbd02e7d06e3126432df892aa4a279614b3 Mon Sep 17 00:00:00 2001
From: Scott Long <scottl@FreeBSD.org>
Date: Sun, 14 Apr 2002 16:36:49 +0000
Subject: [PATCH] Add a filesystem driver for the Universal Disk Format.  For
 more info, see http://people.freebsd.org/~scottl/udf

 MFC after:	when asmodai gets the backport done
 Prodded by:	phk asmodai des
---
 sbin/Makefile        | 1 +
 sys/conf/NOTES       | 1 +
 sys/conf/files       | 3 +++
 sys/conf/options     | 1 +
 sys/modules/Makefile | 1 +
 sys/sys/vnode.h      | 2 +-
 6 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/sbin/Makefile b/sbin/Makefile
index f833e4c2bd8..a0cfa58e7ff 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -49,6 +49,7 @@ SUBDIR=	adjkerntz \
 	mount_nullfs \
 	mount_portalfs \
 	mount_std \
+	mount_udf \
 	mount_umapfs \
 	mount_unionfs \
 	mountd \
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index baea3598d42..33a0e7983c2 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -555,6 +555,7 @@ options 	PORTALFS		#Portal filesystem
 options 	PROCFS			#Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		#Pseudo-filesystem framework
 options 	SMBFS			#SMB/CIFS filesystem
+options		UDF			#Universal Disk Format
 options 	UMAPFS			#UID map filesystem
 options 	UNIONFS			#Union filesystem
 # options 	NODEVFS			#disable devices filesystem
diff --git a/sys/conf/files b/sys/conf/files
index 119efe34041..b7e53fb97e0 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -686,6 +686,9 @@ fs/pseudofs/pseudofs_fileno.c	optional pseudofs
 fs/pseudofs/pseudofs_vncache.c	optional pseudofs
 fs/pseudofs/pseudofs_vnops.c	optional pseudofs
 fs/specfs/spec_vnops.c	standard
+fs/udf/udf_vfsops.c	optional udf
+fs/udf/udf_vnops.c	optional udf
+fs/udf/osta.c		optional udf
 fs/umapfs/umap_subr.c	optional umapfs
 fs/umapfs/umap_vfsops.c	optional umapfs
 fs/umapfs/umap_vnops.c	optional umapfs
diff --git a/sys/conf/options b/sys/conf/options
index 16b918c7d27..f93557dca7a 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -129,6 +129,7 @@ UMAPFS		opt_dontuse.h
 NTFS		opt_dontuse.h
 HPFS		opt_dontuse.h
 UNIONFS		opt_dontuse.h
+UDF		opt_dontuse.h
 
 # Broken - ffs_snapshot() dependency from ufs_lookup() :-(
 FFS		opt_ffs_broken_fixme.h
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 54a6e8370bf..9467dc3b561 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -92,6 +92,7 @@ SUBDIR=	3dfx \
 	ucom \
 	udbp \
 	ufm \
+	udf \
 	ugen \
 	uhid \
 	ukbd \
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index c8c849f6a66..ba1c7593c4a 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -71,7 +71,7 @@ enum vtagtype	{
 	VT_NON, VT_UFS, VT_NFS, VT_UNUSED, VT_PC, VT_LFS, VT_LOFS, VT_FDESC,
 	VT_PORTAL, VT_NULL, VT_UMAP, VT_KERNFS, VT_PROCFS, VT_AFS, VT_ISOFS,
 	VT_UNION, VT_MSDOSFS, VT_DEVFS, VT_TFS, VT_VFS, VT_CODA, VT_NTFS,
-	VT_HPFS, VT_NWFS, VT_PSEUDOFS, VT_SMBFS
+	VT_HPFS, VT_NWFS, VT_PSEUDOFS, VT_SMBFS, VT_UDF
 };
 
 /*