diff options
author | rodrigc <rodrigc@FreeBSD.org> | 2007-02-11 13:54:25 +0000 |
---|---|---|
committer | rodrigc <rodrigc@FreeBSD.org> | 2007-02-11 13:54:25 +0000 |
commit | b236d22de9d89ff115ca8a6bb14457563c4ea3bd (patch) | |
tree | ff1d9118b7072715f302a78c66c6a215d497c3e3 /sys | |
parent | 3c925b07d6111dac4b4ad4a92620b3bf456aa1c9 (diff) | |
download | FreeBSD-src-b236d22de9d89ff115ca8a6bb14457563c4ea3bd.zip FreeBSD-src-b236d22de9d89ff115ca8a6bb14457563c4ea3bd.tar.gz |
Forced commit and #include changes for repo copy from
sys/isofs/cd9660 to sys/fs/cd9660.
Discussed on freebsd-current.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/fs/cd9660/cd9660_bmap.c | 4 | ||||
-rw-r--r-- | sys/fs/cd9660/cd9660_lookup.c | 6 | ||||
-rw-r--r-- | sys/fs/cd9660/cd9660_node.c | 6 | ||||
-rw-r--r-- | sys/fs/cd9660/cd9660_rrip.c | 8 | ||||
-rw-r--r-- | sys/fs/cd9660/cd9660_util.c | 4 | ||||
-rw-r--r-- | sys/fs/cd9660/cd9660_vfsops.c | 8 | ||||
-rw-r--r-- | sys/fs/cd9660/cd9660_vnops.c | 6 |
7 files changed, 21 insertions, 21 deletions
diff --git a/sys/fs/cd9660/cd9660_bmap.c b/sys/fs/cd9660/cd9660_bmap.c index 147f445..5734501 100644 --- a/sys/fs/cd9660/cd9660_bmap.c +++ b/sys/fs/cd9660/cd9660_bmap.c @@ -42,8 +42,8 @@ __FBSDID("$FreeBSD$"); #include <sys/vnode.h> #include <sys/mount.h> -#include <isofs/cd9660/iso.h> -#include <isofs/cd9660/cd9660_node.h> +#include <fs/cd9660/iso.h> +#include <fs/cd9660/cd9660_node.h> /* * Bmap converts a the logical block number of a file to its physical block diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c index 59607b9..3d177c4 100644 --- a/sys/fs/cd9660/cd9660_lookup.c +++ b/sys/fs/cd9660/cd9660_lookup.c @@ -46,9 +46,9 @@ __FBSDID("$FreeBSD$"); #include <sys/vnode.h> #include <sys/mount.h> -#include <isofs/cd9660/iso.h> -#include <isofs/cd9660/cd9660_node.h> -#include <isofs/cd9660/iso_rrip.h> +#include <fs/cd9660/iso.h> +#include <fs/cd9660/cd9660_node.h> +#include <fs/cd9660/iso_rrip.h> /* * Convert a component of a pathname into a pointer to a locked inode. diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c index 69e1043..9f9f1b6 100644 --- a/sys/fs/cd9660/cd9660_node.c +++ b/sys/fs/cd9660/cd9660_node.c @@ -47,9 +47,9 @@ __FBSDID("$FreeBSD$"); #include <sys/stat.h> #include <sys/mutex.h> -#include <isofs/cd9660/iso.h> -#include <isofs/cd9660/cd9660_node.h> -#include <isofs/cd9660/cd9660_mount.h> +#include <fs/cd9660/iso.h> +#include <fs/cd9660/cd9660_node.h> +#include <fs/cd9660/cd9660_mount.h> static unsigned cd9660_chars2ui(unsigned char *begin, int len); diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c index 0b9b1b5..c3c8027 100644 --- a/sys/fs/cd9660/cd9660_rrip.c +++ b/sys/fs/cd9660/cd9660_rrip.c @@ -45,10 +45,10 @@ __FBSDID("$FreeBSD$"); #include <sys/mount.h> #include <sys/kernel.h> -#include <isofs/cd9660/iso.h> -#include <isofs/cd9660/cd9660_node.h> -#include <isofs/cd9660/cd9660_rrip.h> -#include <isofs/cd9660/iso_rrip.h> +#include <fs/cd9660/iso.h> +#include <fs/cd9660/cd9660_node.h> +#include <fs/cd9660/cd9660_rrip.h> +#include <fs/cd9660/iso_rrip.h> typedef int rrt_func_t(void *, ISO_RRIP_ANALYZE *ana); diff --git a/sys/fs/cd9660/cd9660_util.c b/sys/fs/cd9660/cd9660_util.c index 1922627..5372c75 100644 --- a/sys/fs/cd9660/cd9660_util.c +++ b/sys/fs/cd9660/cd9660_util.c @@ -44,8 +44,8 @@ __FBSDID("$FreeBSD$"); #include <sys/vnode.h> #include <sys/iconv.h> -#include <isofs/cd9660/iso.h> -#include <isofs/cd9660/cd9660_mount.h> +#include <fs/cd9660/iso.h> +#include <fs/cd9660/cd9660_mount.h> extern struct iconv_functions *cd9660_iconv; diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index 58f2add..8f94c6a 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -55,10 +55,10 @@ __FBSDID("$FreeBSD$"); #include <sys/syslog.h> #include <sys/iconv.h> -#include <isofs/cd9660/iso.h> -#include <isofs/cd9660/iso_rrip.h> -#include <isofs/cd9660/cd9660_node.h> -#include <isofs/cd9660/cd9660_mount.h> +#include <fs/cd9660/iso.h> +#include <fs/cd9660/iso_rrip.h> +#include <fs/cd9660/cd9660_node.h> +#include <fs/cd9660/cd9660_mount.h> #include <geom/geom.h> #include <geom/geom_vfs.h> diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index 3e67000..1cbfaee 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -57,9 +57,9 @@ __FBSDID("$FreeBSD$"); #include <vm/vnode_pager.h> #include <vm/uma.h> -#include <isofs/cd9660/iso.h> -#include <isofs/cd9660/cd9660_node.h> -#include <isofs/cd9660/iso_rrip.h> +#include <fs/cd9660/iso.h> +#include <fs/cd9660/cd9660_node.h> +#include <fs/cd9660/iso_rrip.h> static vop_setattr_t cd9660_setattr; static vop_open_t cd9660_open; |