linux-ntfs-cvs — List for CVS checkins and comments.

[Linux-NTFS-cvs] CVS: orig-ntfs-tools/linux21 GNUmakefile.in,1.1.1.1,NONE fs.c,1.1.1.1,NONE kernelmakefile,1.1.1.1,NONE kernelpatch,1.1.1.1,NONE ntfs.txt,1.1.1.1,NONE ntfs_fs.h,1.1.1.1,NONE ntfs_fs_i.h.in,1.1.1.1,NONE ntfs_fs_sb.h.in,1.1.1.1,NONE ntfstypes.h,1.1.1.1,NONE support.c,1.1.1.1,NONE sysctl.c,1.1.1.1,NONE sysctl.h,1.1.1.1,NONE

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/orig-ntfs-tools/linux21
In directory usw-pr-cvs1:/tmp/cvs-serv28198/linux21

Removed Files:
	GNUmakefile.in fs.c kernelmakefile kernelpatch ntfs.txt 
	ntfs_fs.h ntfs_fs_i.h.in ntfs_fs_sb.h.in ntfstypes.h support.c 
	sysctl.c sysctl.h 
Log Message:
This repository has been moved to bitkeeper.
Clear out the files and leave a forwarding address.


--- GNUmakefile.in DELETED ---

--- fs.c DELETED ---

--- kernelmakefile DELETED ---

--- kernelpatch DELETED ---

--- ntfs.txt DELETED ---

--- ntfs_fs.h DELETED ---

--- ntfs_fs_i.h.in DELETED ---

--- ntfs_fs_sb.h.in DELETED ---

--- ntfstypes.h DELETED ---

--- support.c DELETED ---

--- sysctl.c DELETED ---

--- sysctl.h DELETED ---

[Linux-NTFS-cvs] CVS: orig-ntfs-tools README.where.have.all.the.files.gone,NONE,1.1 COPYING,1.1.1.1,NONE ChangeLog,1.1,NONE HACKING,1.1.1.1,NONE INSTALL,1.1.1.1,NONE Makefile.in,1.2,NONE README,1.1.1.1,NONE ToDo,1.1.1.1,NONE acconfig.h,1.1.1.1,NONE config.h.in,1.1.1.1,NONE configure,1.1.1.1,NONE configure.in,1.1.1.1,NONE ntfs.lpm,1.1.1.1,NONE

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/orig-ntfs-tools
In directory usw-pr-cvs1:/tmp/cvs-serv28198

Added Files:
	README.where.have.all.the.files.gone 
Removed Files:
	COPYING ChangeLog HACKING INSTALL Makefile.in README ToDo 
	acconfig.h config.h.in configure configure.in ntfs.lpm 
Log Message:
This repository has been moved to bitkeeper.
Clear out the files and leave a forwarding address.


--- NEW FILE ---
NOTE:

This was a respository of the original NTFS userspace tools.
Eventually they will all be replace, but until then they will be
hosted as a BitKeeper Repository at:

    http://linux-ntfs.bkbits.net:8080/tng-support/src?nav=index.html


--- COPYING DELETED ---

--- ChangeLog DELETED ---

--- HACKING DELETED ---

--- INSTALL DELETED ---

--- Makefile.in DELETED ---

--- README DELETED ---

--- ToDo DELETED ---

--- acconfig.h DELETED ---

--- config.h.in DELETED ---

--- configure DELETED ---

--- configure.in DELETED ---

--- ntfs.lpm DELETED ---

[Linux-NTFS-cvs] CVS: orig-ntfs-tools/scripts config.guess,1.1.1.1,NONE config.sub,1.1.1.1,NONE install-sh,1.1.1.1,NONE

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/orig-ntfs-tools/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv28198/scripts

Removed Files:
	config.guess config.sub install-sh 
Log Message:
This repository has been moved to bitkeeper.
Clear out the files and leave a forwarding address.


--- config.guess DELETED ---

--- config.sub DELETED ---

--- install-sh DELETED ---

[Linux-NTFS-cvs] CVS: orig-ntfs-tools/44bsd Makefile.in,1.1.1.1,NONE mount_ntfs.c,1.1.1.1,NONE ntfs_vfsops.c,1.1.1.1,NONE ntfs_vnops.c,1.1.1.1,NONE ntfstypes.h,1.1.1.1,NONE support.c,1.1.1.1,NONE

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/orig-ntfs-tools/44bsd
In directory usw-pr-cvs1:/tmp/cvs-serv28198/44bsd

Removed Files:
	Makefile.in mount_ntfs.c ntfs_vfsops.c ntfs_vnops.c 
	ntfstypes.h support.c 
Log Message:
This repository has been moved to bitkeeper.
Clear out the files and leave a forwarding address.


--- Makefile.in DELETED ---

--- mount_ntfs.c DELETED ---

--- ntfs_vfsops.c DELETED ---

--- ntfs_vnops.c DELETED ---

--- ntfstypes.h DELETED ---

--- support.c DELETED ---

[Linux-NTFS-cvs] CVS: orig-ntfs-tools-2.4/user Makefile.in,1.1.1.1,NONE attrtypes.h,1.1.1.1,NONE dump.c,1.1.1.1,NONE dump.h,1.1.1.1,NONE mkntfs.c,1.1.1.1,NONE ntcat.c,1.1.1.1,NONE ntchange.c,1.1.1.1,NONE ntchmod.c,1.1.1.1,NONE ntcp.c,1.1.1.1,NONE ntdir.c,1.1.1.1,NONE ntdump.c,1.1.1.1,NONE ntfstypes.h,1.1.1.1,NONE ntgrep.c,1.1.1.1,NONE ntlink.c,1.1.1.1,NONE ntmkdir.c,1.1.1.1,NONE ntrm.c,1.1.1.1,NONE nttools.c,1.1.1.1,NONE nttools.h,1.1.1.1,NONE ntundel.c,1.1.1.1,NONE support.c,1.1.1.1,NONE

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/orig-ntfs-tools-2.4/user
In directory usw-pr-cvs1:/tmp/cvs-serv28392/user

Removed Files:
	Makefile.in attrtypes.h dump.c dump.h mkntfs.c ntcat.c 
	ntchange.c ntchmod.c ntcp.c ntdir.c ntdump.c ntfstypes.h 
	ntgrep.c ntlink.c ntmkdir.c ntrm.c nttools.c nttools.h 
	ntundel.c support.c 
Log Message:
This repository was never used.
Clear out the files and leave a forwarding address.


--- Makefile.in DELETED ---

--- attrtypes.h DELETED ---

--- dump.c DELETED ---

--- dump.h DELETED ---

--- mkntfs.c DELETED ---

--- ntcat.c DELETED ---

--- ntchange.c DELETED ---

--- ntchmod.c DELETED ---

--- ntcp.c DELETED ---

--- ntdir.c DELETED ---

--- ntdump.c DELETED ---

--- ntfstypes.h DELETED ---

--- ntgrep.c DELETED ---

--- ntlink.c DELETED ---

--- ntmkdir.c DELETED ---

--- ntrm.c DELETED ---

--- nttools.c DELETED ---

--- nttools.h DELETED ---

--- ntundel.c DELETED ---

--- support.c DELETED ---

[Linux-NTFS-cvs] CVS: orig-ntfs-tools-2.4/scripts config.guess,1.1.1.1,NONE config.sub,1.1.1.1,NONE install-sh,1.1.1.1,NONE

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/orig-ntfs-tools-2.4/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv28392/scripts

Removed Files:
	config.guess config.sub install-sh 
Log Message:
This repository was never used.
Clear out the files and leave a forwarding address.


--- config.guess DELETED ---

--- config.sub DELETED ---

--- install-sh DELETED ---

[Linux-NTFS-cvs] CVS: orig-ntfs-tools-2.4/nt config.h,1.1.1.1,NONE getopt.c,1.1.1.1,NONE getopt.h,1.1.1.1,NONE getopt1.c,1.1.1.1,NONE ntchange.dsp,1.1.1.1,NONE ntchmod.dsp,1.1.1.1,NONE ntcp.dsp,1.1.1.1,NONE ntdir.dsp,1.1.1.1,NONE ntdump.dsp,1.1.1.1,NONE ntfs.dsw,1.1.1.1,NONE ntfstypes.h,1.1.1.1,NONE ntrm.dsp,1.1.1.1,NONE nttypes.h,1.1.1.1,NONE ntundel.dsp,1.1.1.1,NONE

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/orig-ntfs-tools-2.4/nt
In directory usw-pr-cvs1:/tmp/cvs-serv28392/nt

Removed Files:
	config.h getopt.c getopt.h getopt1.c ntchange.dsp ntchmod.dsp 
	ntcp.dsp ntdir.dsp ntdump.dsp ntfs.dsw ntfstypes.h ntrm.dsp 
	nttypes.h ntundel.dsp 
Log Message:
This repository was never used.
Clear out the files and leave a forwarding address.


--- config.h DELETED ---

--- getopt.c DELETED ---

--- getopt.h DELETED ---

--- getopt1.c DELETED ---

--- ntchange.dsp DELETED ---

--- ntchmod.dsp DELETED ---

--- ntcp.dsp DELETED ---

--- ntdir.dsp DELETED ---

--- ntdump.dsp DELETED ---

--- ntfs.dsw DELETED ---

--- ntfstypes.h DELETED ---

--- ntrm.dsp DELETED ---

--- nttypes.h DELETED ---

--- ntundel.dsp DELETED ---

[Linux-NTFS-cvs] CVS: orig-ntfs-tools-2.4/linux22 Makefile.in,1.1.1.1,NONE fs.c,1.2,NONE kernelmakefile,1.2,NONE kernelpatch,1.1.1.1,NONE ntfs.h,1.1.1.1,NONE ntfs.txt,1.1.1.1,NONE ntfs_fs.h,1.1.1.1,NONE ntfs_fs_i.h.in,1.1.1.1,NONE ntfs_fs_sb.h.in,1.1.1.1,NONE ntfstypes.h,1.1.1.1,NONE support.c,1.2,NONE sysctl.c,1.1.1.1,NONE sysctl.h,1.1.1.1,NONE

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/orig-ntfs-tools-2.4/linux22
In directory usw-pr-cvs1:/tmp/cvs-serv28392/linux22

Removed Files:
	Makefile.in fs.c kernelmakefile kernelpatch ntfs.h ntfs.txt 
	ntfs_fs.h ntfs_fs_i.h.in ntfs_fs_sb.h.in ntfstypes.h support.c 
	sysctl.c sysctl.h 
Log Message:
This repository was never used.
Clear out the files and leave a forwarding address.


--- Makefile.in DELETED ---

--- fs.c DELETED ---

--- kernelmakefile DELETED ---

--- kernelpatch DELETED ---

--- ntfs.h DELETED ---

--- ntfs.txt DELETED ---

--- ntfs_fs.h DELETED ---

--- ntfs_fs_i.h.in DELETED ---

--- ntfs_fs_sb.h.in DELETED ---

--- ntfstypes.h DELETED ---

--- support.c DELETED ---

--- sysctl.c DELETED ---

--- sysctl.h DELETED ---

[Linux-NTFS-cvs] CVS: orig-ntfs-tools-2.4/doc AttrDef.html,1.1.1.1,NONE Boot.html,1.1.1.1,NONE LogFile.html,1.1.1.1,NONE UpCase.html,1.1.1.1,NONE abitmap.html,1.1.1.1,NONE attr.html,1.1.1.1,NONE attrlist.html,1.1.1.1,NONE data.html,1.1.1.1,NONE dir.html,1.1.1.1,NONE direntry.html,1.1.1.1,NONE filename.html,1.1.1.1,NONE index.html,1.1.1.1,NONE indexallocation.html,1.1.1.1,NONE indexroot.html,1.1.1.1,NONE logrecord.html,1.1.1.1,NONE mft.html,1.1.1.1,NONE restart.html,1.1.1.1,NONE runs.html,1.1.1.1,NONE special.html,1.1.1.1,NONE standard.html,1.1.1.1,NONE

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/orig-ntfs-tools-2.4/doc
In directory usw-pr-cvs1:/tmp/cvs-serv28392/doc

Removed Files:
	AttrDef.html Boot.html LogFile.html UpCase.html abitmap.html 
	attr.html attrlist.html data.html dir.html direntry.html 
	filename.html index.html indexallocation.html indexroot.html 
	logrecord.html mft.html restart.html runs.html special.html 
	standard.html 
Log Message:
This repository was never used.
Clear out the files and leave a forwarding address.


--- AttrDef.html DELETED ---

--- Boot.html DELETED ---

--- LogFile.html DELETED ---

--- UpCase.html DELETED ---

--- abitmap.html DELETED ---

--- attr.html DELETED ---

--- attrlist.html DELETED ---

--- data.html DELETED ---

--- dir.html DELETED ---

--- direntry.html DELETED ---

--- filename.html DELETED ---

--- index.html DELETED ---

--- indexallocation.html DELETED ---

--- indexroot.html DELETED ---

--- logrecord.html DELETED ---

--- mft.html DELETED ---

--- restart.html DELETED ---

--- runs.html DELETED ---

--- special.html DELETED ---

--- standard.html DELETED ---

[Linux-NTFS-cvs] CVS: orig-ntfs-tools-2.4/common attr.c,1.2,NONE attr.h,1.1.1.1,NONE bitmap.c,1.1.1.1,NONE bitmap.h,1.1.1.1,NONE dir.c,1.1.1.1,NONE dir.h,1.1.1.1,NONE inode.c,1.2,NONE inode.h,1.1.1.1,NONE macros.h,1.1.1.1,NONE mft.c,1.2,NONE mft.h,1.1.1.1,NONE ntfsendian.h,1.1.1.1,NONE struct.h,1.1.1.1,NONE super.c,1.1.1.1,NONE super.h,1.1.1.1,NONE support.h,1.1.1.1,NONE util.c,1.1.1.1,NONE util.h,1.1.1.1,NONE

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/orig-ntfs-tools-2.4/common
In directory usw-pr-cvs1:/tmp/cvs-serv28392/common

Removed Files:
	attr.c attr.h bitmap.c bitmap.h dir.c dir.h inode.c inode.h 
	macros.h mft.c mft.h ntfsendian.h struct.h super.c super.h 
	support.h util.c util.h 
Log Message:
This repository was never used.
Clear out the files and leave a forwarding address.


--- attr.c DELETED ---

--- attr.h DELETED ---

--- bitmap.c DELETED ---

--- bitmap.h DELETED ---

--- dir.c DELETED ---

--- dir.h DELETED ---

--- inode.c DELETED ---

--- inode.h DELETED ---

--- macros.h DELETED ---

--- mft.c DELETED ---

--- mft.h DELETED ---

--- ntfsendian.h DELETED ---

--- struct.h DELETED ---

--- super.c DELETED ---

--- super.h DELETED ---

--- support.h DELETED ---

--- util.c DELETED ---

--- util.h DELETED ---

[Linux-NTFS-cvs] CVS: orig-ntfs-tools-2.4 README.where.have.all.the.files.gone,NONE,1.1 COPYING,1.1.1.1,NONE Changes,1.1.1.1,NONE HACKING,1.1.1.1,NONE INSTALL,1.1.1.1,NONE Makefile.in,1.1.1.1,NONE README,1.1.1.1,NONE Remarks,1.1.1.1,NONE Tests,1.1.1.1,NONE ToDo,1.1.1.1,NONE ToDo.old,1.1,NONE acconfig.h,1.1.1.1,NONE config.h.in,1.1.1.1,NONE configure,1.1.1.1,NONE configure.in,1.1.1.1,NONE ntfs.lpm,1.1.1.1,NONE

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/orig-ntfs-tools-2.4
In directory usw-pr-cvs1:/tmp/cvs-serv28392

Added Files:
	README.where.have.all.the.files.gone 
Removed Files:
	COPYING Changes HACKING INSTALL Makefile.in README Remarks 
	Tests ToDo ToDo.old acconfig.h config.h.in configure 
	configure.in ntfs.lpm 
Log Message:
This repository was never used.
Clear out the files and leave a forwarding address.


--- NEW FILE ---
NOTE:

This repository was a clone of "orig-ntfs-tools", but it was never used.

Until they are replaced, the Original NTFS Tools will be kept as a BitKeeper
Repository at:

    http://linux-ntfs.bkbits.net:8080/tng-support/src?nav=index.html



--- COPYING DELETED ---

--- Changes DELETED ---

--- HACKING DELETED ---

--- INSTALL DELETED ---

--- Makefile.in DELETED ---

--- README DELETED ---

--- Remarks DELETED ---

--- Tests DELETED ---

--- ToDo DELETED ---

--- ToDo.old DELETED ---

--- acconfig.h DELETED ---

--- config.h.in DELETED ---

--- configure DELETED ---

--- configure.in DELETED ---

--- ntfs.lpm DELETED ---

[Linux-NTFS-cvs] CVS: orig-ntfs-tools-2.2/linux22 Makefile.in,1.1.1.1,NONE fs.c,1.1.1.1,NONE kernelmakefile,1.1.1.1,NONE kernelpatch,1.1.1.1,NONE ntfs.h,1.1.1.1,NONE ntfs.txt,1.1.1.1,NONE ntfs_fs.h,1.1.1.1,NONE ntfs_fs_i.h.in,1.1.1.1,NONE ntfs_fs_sb.h.in,1.1.1.1,NONE ntfstypes.h,1.1.1.1,NONE support.c,1.1.1.1,NONE sysctl.c,1.1.1.1,NONE sysctl.h,1.1.1.1,NONE

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/orig-ntfs-tools-2.2/linux22
In directory usw-pr-cvs1:/tmp/cvs-serv27653/linux22

Removed Files:
	Makefile.in fs.c kernelmakefile kernelpatch ntfs.h ntfs.txt 
	ntfs_fs.h ntfs_fs_i.h.in ntfs_fs_sb.h.in ntfstypes.h support.c 
	sysctl.c sysctl.h 
Log Message:
This repository was never used.
Clear out the files and leave a forwarding address.


--- Makefile.in DELETED ---

--- fs.c DELETED ---

--- kernelmakefile DELETED ---

--- kernelpatch DELETED ---

--- ntfs.h DELETED ---

--- ntfs.txt DELETED ---

--- ntfs_fs.h DELETED ---

--- ntfs_fs_i.h.in DELETED ---

--- ntfs_fs_sb.h.in DELETED ---

--- ntfstypes.h DELETED ---

--- support.c DELETED ---

--- sysctl.c DELETED ---

--- sysctl.h DELETED ---

[Linux-NTFS-cvs] CVS: orig-ntfs-tools-2.2/user Makefile.in,1.1.1.1,NONE attrtypes.h,1.1.1.1,NONE dump.c,1.1.1.1,NONE dump.h,1.1.1.1,NONE mkntfs.c,1.1.1.1,NONE ntcat.c,1.1.1.1,NONE ntchange.c,1.1.1.1,NONE ntchmod.c,1.1.1.1,NONE ntcp.c,1.1.1.1,NONE ntdir.c,1.1.1.1,NONE ntdump.c,1.1.1.1,NONE ntfstypes.h,1.1.1.1,NONE ntgrep.c,1.1.1.1,NONE ntlink.c,1.1.1.1,NONE ntmkdir.c,1.1.1.1,NONE ntrm.c,1.1.1.1,NONE nttools.c,1.1.1.1,NONE nttools.h,1.1.1.1,NONE ntundel.c,1.1.1.1,NONE support.c,1.1.1.1,NONE

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/orig-ntfs-tools-2.2/user
In directory usw-pr-cvs1:/tmp/cvs-serv27653/user

Removed Files:
	Makefile.in attrtypes.h dump.c dump.h mkntfs.c ntcat.c 
	ntchange.c ntchmod.c ntcp.c ntdir.c ntdump.c ntfstypes.h 
	ntgrep.c ntlink.c ntmkdir.c ntrm.c nttools.c nttools.h 
	ntundel.c support.c 
Log Message:
This repository was never used.
Clear out the files and leave a forwarding address.


--- Makefile.in DELETED ---

--- attrtypes.h DELETED ---

--- dump.c DELETED ---

--- dump.h DELETED ---

--- mkntfs.c DELETED ---

--- ntcat.c DELETED ---

--- ntchange.c DELETED ---

--- ntchmod.c DELETED ---

--- ntcp.c DELETED ---

--- ntdir.c DELETED ---

--- ntdump.c DELETED ---

--- ntfstypes.h DELETED ---

--- ntgrep.c DELETED ---

--- ntlink.c DELETED ---

--- ntmkdir.c DELETED ---

--- ntrm.c DELETED ---

--- nttools.c DELETED ---

--- nttools.h DELETED ---

--- ntundel.c DELETED ---

--- support.c DELETED ---

[Linux-NTFS-cvs] CVS: orig-ntfs-tools-2.2 README.where.have.all.the.files.gone,NONE,1.1 COPYING,1.1.1.1,NONE Changes,1.1.1.1,NONE HACKING,1.1.1.1,NONE INSTALL,1.1.1.1,NONE Makefile.in,1.1.1.1,NONE README,1.1.1.1,NONE Remarks,1.1.1.1,NONE Tests,1.1.1.1,NONE ToDo,1.1.1.1,NONE ToDo.old,1.1,NONE acconfig.h,1.1.1.1,NONE config.h.in,1.1.1.1,NONE configure,1.1.1.1,NONE configure.in,1.1.1.1,NONE ntfs.lpm,1.1.1.1,NONE

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/orig-ntfs-tools-2.2
In directory usw-pr-cvs1:/tmp/cvs-serv27653

Added Files:
	README.where.have.all.the.files.gone 
Removed Files:
	COPYING Changes HACKING INSTALL Makefile.in README Remarks 
	Tests ToDo ToDo.old acconfig.h config.h.in configure 
	configure.in ntfs.lpm 
Log Message:
This repository was never used.
Clear out the files and leave a forwarding address.


--- NEW FILE ---
NOTE:

This repository was a clone of "orig-ntfs-tools", but it was never used.

Until they are replaced, the Original NTFS Tools will be kept as a BitKeeper
Repository at:

    http://linux-ntfs.bkbits.net:8080/tng-support/src?nav=index.html



--- COPYING DELETED ---

--- Changes DELETED ---

--- HACKING DELETED ---

--- INSTALL DELETED ---

--- Makefile.in DELETED ---

--- README DELETED ---

--- Remarks DELETED ---

--- Tests DELETED ---

--- ToDo DELETED ---

--- ToDo.old DELETED ---

--- acconfig.h DELETED ---

--- config.h.in DELETED ---

--- configure DELETED ---

--- configure.in DELETED ---

--- ntfs.lpm DELETED ---

[Linux-NTFS-cvs] CVS: orig-ntfs-tools-2.2/nt config.h,1.1.1.1,NONE getopt.c,1.1.1.1,NONE getopt.h,1.1.1.1,NONE getopt1.c,1.1.1.1,NONE ntchange.dsp,1.1.1.1,NONE ntchmod.dsp,1.1.1.1,NONE ntcp.dsp,1.1.1.1,NONE ntdir.dsp,1.1.1.1,NONE ntdump.dsp,1.1.1.1,NONE ntfs.dsw,1.1.1.1,NONE ntfstypes.h,1.1.1.1,NONE ntrm.dsp,1.1.1.1,NONE nttypes.h,1.1.1.1,NONE ntundel.dsp,1.1.1.1,NONE

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/orig-ntfs-tools-2.2/nt
In directory usw-pr-cvs1:/tmp/cvs-serv27653/nt

Removed Files:
	config.h getopt.c getopt.h getopt1.c ntchange.dsp ntchmod.dsp 
	ntcp.dsp ntdir.dsp ntdump.dsp ntfs.dsw ntfstypes.h ntrm.dsp 
	nttypes.h ntundel.dsp 
Log Message:
This repository was never used.
Clear out the files and leave a forwarding address.


--- config.h DELETED ---

--- getopt.c DELETED ---

--- getopt.h DELETED ---

--- getopt1.c DELETED ---

--- ntchange.dsp DELETED ---

--- ntchmod.dsp DELETED ---

--- ntcp.dsp DELETED ---

--- ntdir.dsp DELETED ---

--- ntdump.dsp DELETED ---

--- ntfs.dsw DELETED ---

--- ntfstypes.h DELETED ---

--- ntrm.dsp DELETED ---

--- nttypes.h DELETED ---

--- ntundel.dsp DELETED ---

[Linux-NTFS-cvs] CVS: orig-ntfs-tools-2.2/scripts config.guess,1.1.1.1,NONE config.sub,1.1.1.1,NONE install-sh,1.1.1.1,NONE

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/orig-ntfs-tools-2.2/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv27653/scripts

Removed Files:
	config.guess config.sub install-sh 
Log Message:
This repository was never used.
Clear out the files and leave a forwarding address.


--- config.guess DELETED ---

--- config.sub DELETED ---

--- install-sh DELETED ---

[Linux-NTFS-cvs] CVS: orig-ntfs-tools-2.2/common attr.c,1.1.1.1,NONE attr.h,1.1.1.1,NONE bitmap.c,1.1.1.1,NONE bitmap.h,1.1.1.1,NONE dir.c,1.1.1.1,NONE dir.h,1.1.1.1,NONE inode.c,1.1.1.1,NONE inode.h,1.1.1.1,NONE macros.h,1.1.1.1,NONE mft.c,1.1.1.1,NONE mft.h,1.1.1.1,NONE ntfsendian.h,1.1.1.1,NONE struct.h,1.1.1.1,NONE super.c,1.1.1.1,NONE super.h,1.1.1.1,NONE support.h,1.1.1.1,NONE util.c,1.1.1.1,NONE util.h,1.1.1.1,NONE

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/orig-ntfs-tools-2.2/common
In directory usw-pr-cvs1:/tmp/cvs-serv27653/common

Removed Files:
	attr.c attr.h bitmap.c bitmap.h dir.c dir.h inode.c inode.h 
	macros.h mft.c mft.h ntfsendian.h struct.h super.c super.h 
	support.h util.c util.h 
Log Message:
This repository was never used.
Clear out the files and leave a forwarding address.


--- attr.c DELETED ---

--- attr.h DELETED ---

--- bitmap.c DELETED ---

--- bitmap.h DELETED ---

--- dir.c DELETED ---

--- dir.h DELETED ---

--- inode.c DELETED ---

--- inode.h DELETED ---

--- macros.h DELETED ---

--- mft.c DELETED ---

--- mft.h DELETED ---

--- ntfsendian.h DELETED ---

--- struct.h DELETED ---

--- super.c DELETED ---

--- super.h DELETED ---

--- support.h DELETED ---

--- util.c DELETED ---

--- util.h DELETED ---

[Linux-NTFS-cvs] CVS: orig-ntfs-tools-2.2/doc AttrDef.html,1.1.1.1,NONE Boot.html,1.1.1.1,NONE LogFile.html,1.1.1.1,NONE UpCase.html,1.1.1.1,NONE abitmap.html,1.1.1.1,NONE attr.html,1.1.1.1,NONE attrlist.html,1.1.1.1,NONE data.html,1.1.1.1,NONE dir.html,1.1.1.1,NONE direntry.html,1.1.1.1,NONE filename.html,1.1.1.1,NONE index.html,1.1.1.1,NONE indexallocation.html,1.1.1.1,NONE indexroot.html,1.1.1.1,NONE logrecord.html,1.1.1.1,NONE mft.html,1.1.1.1,NONE restart.html,1.1.1.1,NONE runs.html,1.1.1.1,NONE special.html,1.1.1.1,NONE standard.html,1.1.1.1,NONE

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/orig-ntfs-tools-2.2/doc
In directory usw-pr-cvs1:/tmp/cvs-serv27653/doc

Removed Files:
	AttrDef.html Boot.html LogFile.html UpCase.html abitmap.html 
	attr.html attrlist.html data.html dir.html direntry.html 
	filename.html index.html indexallocation.html indexroot.html 
	logrecord.html mft.html restart.html runs.html special.html 
	standard.html 
Log Message:
This repository was never used.
Clear out the files and leave a forwarding address.


--- AttrDef.html DELETED ---

--- Boot.html DELETED ---

--- LogFile.html DELETED ---

--- UpCase.html DELETED ---

--- abitmap.html DELETED ---

--- attr.html DELETED ---

--- attrlist.html DELETED ---

--- data.html DELETED ---

--- dir.html DELETED ---

--- direntry.html DELETED ---

--- filename.html DELETED ---

--- index.html DELETED ---

--- indexallocation.html DELETED ---

--- indexroot.html DELETED ---

--- logrecord.html DELETED ---

--- mft.html DELETED ---

--- restart.html DELETED ---

--- runs.html DELETED ---

--- special.html DELETED ---

--- standard.html DELETED ---

[Linux-NTFS-cvs] CVS: dynamic-disk/test ldminfo.c,1.33,1.34

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk/test
In directory usw-pr-cvs1:/tmp/cvs-serv24330/test

Modified Files:
	ldminfo.c 
Log Message:
update version number


Index: ldminfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/ldminfo.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -U2 -r1.33 -r1.34
--- ldminfo.c	5 Aug 2002 15:46:51 -0000	1.33
+++ ldminfo.c	9 Aug 2002 10:38:32 -0000	1.34
@@ -100,5 +100,5 @@
 
 	if (ver) {
-		printf ("\nldminfo v0.0.7\n\n");
+		printf ("\nldminfo v0.0.8\n\n");
 		return 1;
 	}

[Linux-NTFS-cvs] CVS: dynamic-disk ChangeLog,1.18,1.19

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk
In directory usw-pr-cvs1:/tmp/cvs-serv24330

Modified Files:
	ChangeLog 
Log Message:
update version number


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -U2 -r1.18 -r1.19
--- ChangeLog	23 Jun 2002 17:07:11 -0000	1.18
+++ ChangeLog	9 Aug 2002 10:38:32 -0000	1.19
@@ -1,2 +1,9 @@
+2002-08-09 Richard Russon <ld...@fl...>
+
+	* Version 0.0.8 released
+	* Updated with Al Viro's partitions cleanup
+	* More tidyups
+	* Created patches for current kernels
+
 2002-06-23 Richard Russon <ld...@fl...>
 

[Linux-NTFS-cvs] CVS: dynamic-disk/patch patch-2.4.19-ldm,NONE,1.1 patch-2.4.20-pre1-ac1-ldm,NONE,1.1

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk/patch
In directory usw-pr-cvs1:/tmp/cvs-serv20764

Added Files:
	patch-2.4.19-ldm patch-2.4.20-pre1-ac1-ldm 
Log Message:
new patches


--- NEW FILE ---
diff -urN linux-2.4.19/Documentation/Configure.help linux-2.4.19-ldm/Documentation/Configure.help
--- linux-2.4.19/Documentation/Configure.help	Sat Aug  3 01:39:42 2002
+++ linux-2.4.19-ldm/Documentation/Configure.help	Wed Aug  7 09:53:26 2002
@@ -15239,7 +15239,7 @@
   Say Y here if you would like to use hard disks under Linux which
   were partitioned on a Macintosh.
 
-Windows Logical Disk Manager (Dynamic Disk) support (EXPERIMENTAL)
+Windows Logical Disk Manager (Dynamic Disk) support
 CONFIG_LDM_PARTITION
   Say Y here if you would like to use hard disks under Linux which
   were partitioned using Windows 2000's or XP's Logical Disk Manager.
@@ -15254,8 +15254,7 @@
   Normal partitions are now called Basic Disks under Windows 2000 and
   XP.
 
-  Technical documentation to accompany this driver is available from:
-  <http://linux-ntfs.sf.net/ldm/>.
+  For a fuller description read <file:Documentation/ldm.txt>.
[...2816 lines suppressed...]
+};
+
+struct ldmdb {				/* Cache of the database */
+	struct privhead ph;
+	struct tocblock toc;
+	struct vmdb     vm;
+	struct list_head v_dgrp;
+	struct list_head v_disk;
+	struct list_head v_volu;
+	struct list_head v_comp;
+	struct list_head v_part;
 };
 
-int ldm_partition(struct gendisk *hd, struct block_device *bdev,
-		unsigned long first_sector, int first_part_minor);
+int ldm_partition (struct gendisk *hd, struct block_device *bdev,
+	unsigned long first_sector, int first_minor);
 
 #endif /* _FS_PT_LDM_H_ */
 

--- NEW FILE ---
diff -urN linux-2.4.20-pre1-ac1/Documentation/Configure.help linux-2.4.20-pre1-ac1-ldm/Documentation/Configure.help
--- linux-2.4.20-pre1-ac1/Documentation/Configure.help	Wed Aug  7 16:47:20 2002
+++ linux-2.4.20-pre1-ac1-ldm/Documentation/Configure.help	Thu Aug  8 00:20:50 2002
@@ -15340,7 +15340,7 @@
   Say Y here if you would like to use hard disks under Linux which
   were partitioned on a Macintosh.
 
-Windows Logical Disk Manager (Dynamic Disk) support (EXPERIMENTAL)
+Windows Logical Disk Manager (Dynamic Disk) support
 CONFIG_LDM_PARTITION
   Say Y here if you would like to use hard disks under Linux which
   were partitioned using Windows 2000's or XP's Logical Disk Manager.
@@ -15355,8 +15355,7 @@
   Normal partitions are now called Basic Disks under Windows 2000 and
   XP.
 
-  Technical documentation to accompany this driver is available from:
-  <http://linux-ntfs.sf.net/ldm/>.
+  For a fuller description read <file:Documentation/ldm.txt>.
[...2817 lines suppressed...]
+};
+
+struct ldmdb {				/* Cache of the database */
+	struct privhead ph;
+	struct tocblock toc;
+	struct vmdb     vm;
+	struct list_head v_dgrp;
+	struct list_head v_disk;
+	struct list_head v_volu;
+	struct list_head v_comp;
+	struct list_head v_part;
 };
 
-int ldm_partition(struct gendisk *hd, struct block_device *bdev,
-		unsigned long first_sector, int first_part_minor);
+int ldm_partition (struct gendisk *hd, struct block_device *bdev,
+	unsigned long first_sector, int first_minor);
 
 #endif /* _FS_PT_LDM_H_ */
 

[Linux-NTFS-cvs] CVS: dynamic-disk/patch readme,1.1,1.2 remove-non-kernel,1.1,1.2 linux-2.4.18-ldm,1.1,NONE linux-2.4.19-pre10-ldm,1.1,NONE linux-2.5.23-ldm,1.1,NONE linux-2.5.24-ldm,1.1,NONE

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk/patch
In directory usw-pr-cvs1:/tmp/cvs-serv20489/patch

Modified Files:
	readme remove-non-kernel 
Removed Files:
	linux-2.4.18-ldm linux-2.4.19-pre10-ldm linux-2.5.23-ldm 
	linux-2.5.24-ldm 
Log Message:
patches updated


Index: readme
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/patch/readme,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- readme	23 Jun 2002 16:38:25 -0000	1.1
+++ readme	9 Aug 2002 10:27:40 -0000	1.2
@@ -1,10 +1,9 @@
-If you want to add the latest LDM driver to the kernel you can use the patches
-in this directory.
+The new driver has now been accepted into the 2.5 Linux kernel (2.5.29).
 
-Patch                      For Kernel
+If you want to add the latest LDM driver to a 2.4 kernel you can use
+one of these patches:
+
+Marcelo  patch-2.4.19-ldm
+Alan     patch-2.4.20-pre1-ac1-ldm
 
-linux-2.4.18-ldm           2.4.17 or 2.4.18
-linux-2.4.19-pre10-ldm     2.4.19-pre10 or later
-linux-2.5.23-ldm           2.5.23 or earlier
-linux-2.5.24-ldm           2.5.24 or later
 

Index: remove-non-kernel
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/patch/remove-non-kernel,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- remove-non-kernel	23 Jun 2002 16:38:25 -0000	1.1
+++ remove-non-kernel	9 Aug 2002 10:27:40 -0000	1.2
@@ -1,5 +1,5 @@
---- src/ldm.c	Fri Jun 21 15:37:16 2002
-+++ kernel/ldm.c	Sun Jun 23 17:12:45 2002
-@@ -32,19 +32,6 @@
+--- src/ldm.c	Mon Aug  5 15:34:38 2002
++++ kernel/ldm.c	Mon Aug  5 16:50:20 2002
+@@ -29,19 +29,6 @@
  #include "check.h"
  #include "msdos.h"
@@ -14,6 +14,6 @@
 -
 -#ifdef CONFIG_LDM_MD
--extern void ldm_md_addpart (const u8 *dg_guid, u32 objid, u8 comptype,
--			u8 n, u8 parts, u8 chunk_s, kdev_t dev);
+-void ldm_md_addpart(const u8 *dg_guid, u32 objid, u8 comptype,
+-		    u8 n, u8 parts, u8 chunk_s, kdev_t dev);
 -#endif
 -
@@ -21,5 +21,5 @@
  	FALSE = 0,
  	TRUE  = 1
-@@ -603,32 +590,6 @@
+@@ -594,32 +581,6 @@
  }
  
@@ -52,21 +52,36 @@
 -/**
   * ldm_get_disk_objid - Search a linked list of vblk's for a given Disk Id
-  * @ldb:  ldmdb struct
+  * @ldb:  Cache of the database structures
   *
-@@ -732,10 +693,6 @@
+@@ -662,14 +623,8 @@
+  * Return:  TRUE   Partition created
+  *          FALSE  Error, probably a range checking problem
+  */
+-#ifdef CONFIG_BLK_DEV_MD
+-static BOOL ldm_create_data_partitions (struct parsed_partitions *pp,
+-					const struct ldmdb *ldb,
+-					struct block_device *bdev)
+-#else
+ static BOOL ldm_create_data_partitions (struct parsed_partitions *pp,
+ 					const struct ldmdb *ldb)
+-#endif
+ {
+ 	struct list_head *item;
+ 	struct vblk *vb;
+@@ -689,10 +644,6 @@
+ 
  	/* Create the data partitions */
  	list_for_each (item, &ldb->v_part) {
- 		struct vblk *vb;
 -#ifdef CONFIG_BLK_DEV_MD	/* CONFIG_LDM_MD implies CONFIG_BLK_DEV_MD */
 -		struct vblk *v, *c;
--		const kdev_t dev = mk_kdev (hd->major, minor);
+-		const kdev_t dev = bdev->bd_inode->i_dev;
 -#endif
  		vb = list_entry (item, struct vblk, list);
  		part = &vb->vblk.part;
  
-@@ -746,33 +703,6 @@
- 		    part->start + ldb->ph.logical_disk_start, part->size))
- 			continue;			/* Already logged */
- 		minor++;
+@@ -701,33 +652,6 @@
+ 
+ 		put_partition (pp, part_num, ldb->ph.logical_disk_start +
+ 				part->start, part->size);
 -#ifdef CONFIG_BLK_DEV_MD
 -		/* Try to get parent component */
@@ -89,6 +104,6 @@
 -			continue;
 -		}
--		/* Register to LDM_MD */
 -#ifdef CONFIG_LDM_MD
+-		/* Register to LDM_MD */
 -		ldm_md_addpart (v->vblk.volu.guid, c->obj_id,
 -		    c->vblk.comp.type, part->partnum, c->vblk.comp.children,
@@ -96,5 +111,78 @@
 -#endif
 -#endif
+ 		part_num++;
+ 	}
+ 
+@@ -1490,15 +1414,9 @@
+  *         -1 An error occurred before enough information had been read
+  *            Or @bdev is a dynamic disk, but it may be corrupted
+  */
+-#ifdef CONFIG_LDM_EXPORT_SYMBOLS
+-int ldm_partition (struct parsed_partitions *pp, struct block_device *bdev, struct ldmdb *ldb)
+-#else
+ int ldm_partition (struct parsed_partitions *pp, struct block_device *bdev)
+-#endif
+ {
+-#ifndef CONFIG_LDM_EXPORT_SYMBOLS
+ 	struct ldmdb  *ldb;
+-#endif
+ 	unsigned long base;
+ 	int result = -1;
+ 
+@@ -1508,13 +1426,11 @@
+ 	if (!ldm_validate_partition_table (bdev))
+ 		return 0;
+ 
+-#ifndef CONFIG_LDM_EXPORT_SYMBOLS
+ 	ldb = kmalloc (sizeof (*ldb), GFP_KERNEL);
+ 	if (!ldb) {
+ 		ldm_crit ("Out of memory.");
+ 		goto out;
+ 	}
+-#endif
+ 
+ 	/* Parse and check privheads. */
+ 	if (!ldm_validate_privheads (bdev, &ldb->ph))
+@@ -1529,13 +1445,11 @@
+ 	    	goto out;		/* Already logged */
+ 
+ 	/* Initialize vblk lists in ldmdb struct */
+-#ifndef CONFIG_LDM_EXPORT_SYMBOLS
+ 	INIT_LIST_HEAD (&ldb->v_dgrp);
+ 	INIT_LIST_HEAD (&ldb->v_disk);
+ 	INIT_LIST_HEAD (&ldb->v_volu);
+ 	INIT_LIST_HEAD (&ldb->v_comp);
+ 	INIT_LIST_HEAD (&ldb->v_part);
+-#endif
+ 
+ 	if (!ldm_get_vblks (bdev, base, ldb)) {
+ 		ldm_crit ("Failed to read the VBLKs from the database.");
+@@ -1543,28 +1457,20 @@
+ 	}
+ 
+ 	/* Finally, create the data partition devices. */
+-#ifdef CONFIG_BLK_DEV_MD
+-	if (ldm_create_data_partitions (pp, ldb, bdev)) {
+-#else
+ 	if (ldm_create_data_partitions (pp, ldb)) {
+-#endif
+ 		ldm_debug ("Parsed LDM database successfully.");
+ 		result = 1;
  	}
+ 	/* else Already logged */
+ 
+ cleanup:
+-#ifndef CONFIG_LDM_EXPORT_SYMBOLS
+ 	ldm_free_vblks (&ldb->v_dgrp);
+ 	ldm_free_vblks (&ldb->v_disk);
+ 	ldm_free_vblks (&ldb->v_volu);
+ 	ldm_free_vblks (&ldb->v_comp);
+ 	ldm_free_vblks (&ldb->v_part);
+-#endif
+ out:
+-#ifndef CONFIG_LDM_EXPORT_SYMBOLS
+ 	kfree (ldb);
+-#endif
+ 	return result;
+ }
  
- 	printk ("\n");

--- linux-2.4.18-ldm DELETED ---

--- linux-2.4.19-pre10-ldm DELETED ---

--- linux-2.5.23-ldm DELETED ---

--- linux-2.5.24-ldm DELETED ---

[Linux-NTFS-cvs] CVS: dynamic-disk/linux/fs/partitions ldm.c,1.81,1.82

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv25565

Modified Files:
	ldm.c 
Log Message:
split up BUG_ONs


Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -U2 -r1.81 -r1.82
--- ldm.c	5 Aug 2002 15:46:50 -0000	1.81
+++ ldm.c	8 Aug 2002 12:32:44 -0000	1.82
@@ -150,5 +150,6 @@
 static BOOL ldm_parse_privhead (const u8 *data, struct privhead *ph)
 {
-	BUG_ON (!data || !ph);
+	BUG_ON (!data);
+	BUG_ON (!ph);
 
 	if (MAGIC_PRIVHEAD != BE64 (data)) {
@@ -207,5 +208,6 @@
 static BOOL ldm_parse_tocblock (const u8 *data, struct tocblock *toc)
 {
-	BUG_ON (!data || !toc);
+	BUG_ON (!data);
+	BUG_ON (!toc);
 
 	if (MAGIC_TOCBLOCK != BE64 (data)) {
@@ -253,5 +255,6 @@
 static BOOL ldm_parse_vmdb (const u8 *data, struct vmdb *vm)
 {
-	BUG_ON (!data || !vm);
+	BUG_ON (!data);
+	BUG_ON (!vm);
 
 	if (MAGIC_VMDB != BE32 (data)) {
@@ -289,5 +292,6 @@
 				   const struct privhead *ph2)
 {
-	BUG_ON (!ph1 || !ph2);
+	BUG_ON (!ph1);
+	BUG_ON (!ph2);
 
 	return ((ph1->ver_major          == ph2->ver_major)		&&
@@ -313,5 +317,6 @@
 				   const struct tocblock *toc2)
 {
-	BUG_ON (!toc1 || !toc2);
+	BUG_ON (!toc1);
+	BUG_ON (!toc2);
 
 	return ((toc1->bitmap1_start == toc2->bitmap1_start)	&&
@@ -350,5 +355,6 @@
 	int i;
 
-	BUG_ON (!bdev || !ph1);
+	BUG_ON (!bdev);
+	BUG_ON (!ph1);
 
 	ph[1] = kmalloc (sizeof (*ph[1]), GFP_KERNEL);
@@ -438,5 +444,6 @@
 	int i;
 
-	BUG_ON (!bdev || !ldb);
+	BUG_ON (!bdev);
+	BUG_ON (!ldb);
 
 	ph    = &ldb->ph;
@@ -507,5 +514,6 @@
 	struct tocblock *toc;
 
-	BUG_ON (!bdev || !ldb);
+	BUG_ON (!bdev);
+	BUG_ON (!ldb);
 
 	vm  = &ldb->vm;
@@ -678,5 +686,6 @@
 	int part_num = 1;
 
-	BUG_ON (!pp || !ldb);
+	BUG_ON (!pp);
+	BUG_ON (!ldb);
 
 	disk = ldm_get_disk_objid (ldb);
@@ -817,5 +826,6 @@
 	int length;
 
-	BUG_ON (!block || !buffer);
+	BUG_ON (!block);
+	BUG_ON (!buffer);
 
 	length = block[0];
@@ -846,5 +856,6 @@
 	struct vblk_comp *comp;
 
-	BUG_ON (!buffer || !vb);
+	BUG_ON (!buffer);
+	BUG_ON (!vb);
 
 	r_objid  = ldm_relative (buffer, buflen, 0x18, 0);
@@ -897,5 +908,6 @@
 	struct vblk_dgrp *dgrp;
 
-	BUG_ON (!buffer || !vb);
+	BUG_ON (!buffer);
+	BUG_ON (!vb);
 
 	r_objid  = ldm_relative (buffer, buflen, 0x18, 0);
@@ -942,5 +954,6 @@
 	struct vblk_dgrp *dgrp;
 
-	BUG_ON (!buffer || !vb);
+	BUG_ON (!buffer);
+	BUG_ON (!vb);
 
 	r_objid  = ldm_relative (buffer, buflen, 0x18, 0);
@@ -985,5 +998,6 @@
 	struct vblk_disk *disk;
 
-	BUG_ON (!buffer || !vb);
+	BUG_ON (!buffer);
+	BUG_ON (!vb);
 
 	r_objid   = ldm_relative (buffer, buflen, 0x18, 0);
@@ -1024,5 +1038,6 @@
 	struct vblk_disk *disk;
 
-	BUG_ON (!buffer || !vb);
+	BUG_ON (!buffer);
+	BUG_ON (!vb);
 
 	r_objid = ldm_relative (buffer, buflen, 0x18, 0);
@@ -1057,5 +1072,6 @@
 	struct vblk_part *part;
 
-	BUG_ON (!buffer || !vb);
+	BUG_ON (!buffer);
+	BUG_ON (!vb);
 
 	r_objid  = ldm_relative (buffer, buflen, 0x18, 0);
@@ -1110,5 +1126,6 @@
 	struct vblk_volu *volu;
 
-	BUG_ON (!buffer || !vb);
+	BUG_ON (!buffer);
+	BUG_ON (!vb);
 
 	r_objid  = ldm_relative (buffer, buflen, 0x18, 0);
@@ -1180,5 +1197,6 @@
 	int r_objid;
 
-	BUG_ON (!buf || !vb);
+	BUG_ON (!buf);
+	BUG_ON (!vb);
 
 	r_objid = ldm_relative (buf, len, 0x18, 0);
@@ -1232,5 +1250,6 @@
 	struct list_head *item;
 
-	BUG_ON (!data || !ldb);
+	BUG_ON (!data);
+	BUG_ON (!ldb);
 
 	vb = kmalloc (sizeof (*vb), GFP_KERNEL);
@@ -1293,5 +1312,6 @@
 	int rec, num, group;
 
-	BUG_ON (!data || !frags);
+	BUG_ON (!data);
+	BUG_ON (!frags);
 
 	group = BE32 (data + 0x08);
@@ -1373,5 +1393,6 @@
 	struct list_head *item;
 
-	BUG_ON (!frags || !ldb);
+	BUG_ON (!frags);
+	BUG_ON (!ldb);
 
 	list_for_each (item, frags) {
@@ -1411,5 +1432,6 @@
 	LIST_HEAD (frags);
 
-	BUG_ON (!bdev || !ldb);
+	BUG_ON (!bdev);
+	BUG_ON (!ldb);
 
 	size   = ldb->vm.vblk_size;
@@ -1503,5 +1525,6 @@
 	int result = -1;
 
-	BUG_ON (!pp || !bdev);
+	BUG_ON (!pp);
+	BUG_ON (!bdev);
 
 	/* Look for signs of a Dynamic Disk */

[Linux-NTFS-cvs] CVS: dynamic-disk/linux/fs/partitions ldm.c,1.80,1.81 ldm.h,1.49,1.50

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv5436/linux/fs/partitions

Modified Files:
	ldm.c ldm.h 
Log Message:
tidy ups, build fixes


Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -U2 -r1.80 -r1.81
--- ldm.c	23 Jun 2002 17:07:11 -0000	1.80
+++ ldm.c	5 Aug 2002 15:46:50 -0000	1.81
@@ -24,10 +24,5 @@
  */
 
-#include <linux/blkdev.h>
 #include <linux/slab.h>
-#include <linux/pagemap.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,11)
-#include <linux/buffer_head.h>
-#endif
 #include <linux/stringify.h>
 #include "ldm.h"
@@ -44,6 +39,6 @@
 
 #ifdef CONFIG_LDM_MD
-extern void ldm_md_addpart (const u8 *dg_guid, u32 objid, u8 comptype,
-			u8 n, u8 parts, u8 chunk_s, kdev_t dev);
+void ldm_md_addpart(const u8 *dg_guid, u32 objid, u8 comptype,
+		    u8 n, u8 parts, u8 chunk_s, kdev_t dev);
 #endif
 
@@ -56,5 +51,5 @@
  * ldm_debug/info/error/crit - Output an error message
  * @f:    A printf format string containing the message
- * @...:  The variables to substitute into @f
+ * @...:  Variables to substitute into @f
  *
  * ldm_debug() writes a DEBUG level message to the syslog but only if the
@@ -219,5 +214,5 @@
 	}
 	strncpy (toc->bitmap1_name, data + 0x24, sizeof (toc->bitmap1_name));
-	toc->bitmap1_name[sizeof (toc->bitmap1_name) - 1] = (u8)'\0';
+	toc->bitmap1_name[sizeof (toc->bitmap1_name) - 1] = 0;
 	toc->bitmap1_start = BE64 (data + 0x2E);
 	toc->bitmap1_size  = BE64 (data + 0x36);
@@ -230,5 +225,5 @@
 	}
 	strncpy (toc->bitmap2_name, data + 0x46, sizeof (toc->bitmap2_name));
-	toc->bitmap2_name[sizeof (toc->bitmap2_name) - 1] = (u8)'\0';
+	toc->bitmap2_name[sizeof (toc->bitmap2_name) - 1] = 0;
 	toc->bitmap2_start = BE64 (data + 0x50);
 	toc->bitmap2_size  = BE64 (data + 0x58);
@@ -283,6 +278,6 @@
 /**
  * ldm_compare_privheads - Compare two privhead objects
- * @ph1:  first privhead
- * @ph2:  second privhead
+ * @ph1:  First privhead
+ * @ph2:  Second privhead
  *
  * This compares the two privhead structures @ph1 and @ph2.
@@ -307,6 +302,6 @@
 /**
  * ldm_compare_tocblocks - Compare two tocblock objects
- * @toc1:  first toc
- * @toc2:  second toc
+ * @toc1:  First toc
+ * @toc2:  Second toc
  *
  * This compares the two tocblock structures @toc1 and @toc2.
@@ -332,9 +327,6 @@
 /**
  * ldm_validate_privheads - Compare the primary privhead with its backups
- * @bdev:          Partition device holding the LDM Database
- * @first_sector:  First sector within the device
- * @ph1:           Memory struct to fill with ph contents
- * @hd:            The array of all disks
- * @first_minor:   The first available device minor
+ * @bdev:  Device holding the LDM Database
+ * @ph1:   Memory struct to fill with ph contents
  *
  * Read and compare all three privheads from disk.
@@ -348,6 +340,5 @@
  */
 static BOOL ldm_validate_privheads (struct block_device *bdev,
-	unsigned long first_sector, struct privhead *ph1, struct gendisk *hd,
-	unsigned long first_minor)
+				    struct privhead *ph1)
 {
 	static const int off[3] = { OFF_PRIV1, OFF_PRIV2, OFF_PRIV3 };
@@ -374,5 +365,5 @@
 	for (i = 0; i < 3; i++) {
 		data = read_dev_sector (bdev,
-			first_sector + ph[0]->config_start + off[i], &sect);
+			ph[0]->config_start + off[i], &sect);
 		if (!data) {
 			ldm_crit ("Disk read failed.");
@@ -390,6 +381,5 @@
 	}
 
-	num_sects = hd->part[(first_minor >> hd->minor_shift)
-				<< hd->minor_shift].nr_sects;
+	num_sects = bdev->bd_inode->i_size >> 9;
 
 	if ((ph[0]->config_start > num_sects) ||
@@ -414,6 +404,5 @@
 		ldm_crit ("Primary and backup PRIVHEADs don't match.");
 		goto out;
-	}
-	*/
+	}*/
 	ldm_debug ("Validated PRIVHEADs successfully.");
 	result = TRUE;
@@ -426,7 +415,7 @@
 /**
  * ldm_validate_tocblocks - Validate the table of contents and its backups
- * @bdev:  Partition device holding the LDM Database
- * @base:  The offset into the device
- * @toc1:  In-memory table of contents in which to return information
+ * @bdev:  Device holding the LDM Database
+ * @base:  Offset, into @bdev, of the database
+ * @ldb:   Cache of the database structures
  *
  * Find and compare the four tables of contents of the LDM Database stored on
@@ -500,12 +489,12 @@
  * ldm_validate_vmdb - Read the VMDB and validate it
  * @bdev:  Device holding the LDM Database
- * @base:  The offset into the device
- * @vm:    In-memory vmdb in which to return information
+ * @base:  Offset, into @bdev, of the database
+ * @ldb:   Cache of the database structures
  *
  * Find the vmdb of the LDM Database stored on @bdev and return the parsed
- * information in @vm.
+ * information in @ldb.
  *
- * Return:  TRUE   @vm contains validated VBDB info
- *          FALSE  @vm contents are undefined
+ * Return:  TRUE   @ldb contains validated VBDB info
+ *          FALSE  @ldb contents are undefined
  */
 static BOOL ldm_validate_vmdb (struct block_device *bdev, unsigned long base,
@@ -542,5 +531,5 @@
 
 	/* FIXME: How should we handle this situation? */
-	if ((vm->vblk_size * vm->last_vblk_seq) != (toc->bitmap1_size * 512))
+	if ((vm->vblk_size * vm->last_vblk_seq) != (toc->bitmap1_size << 9))
 		ldm_info ("VMDB and TOCBLOCK don't agree on the database size.");
 
@@ -554,5 +543,5 @@
 /**
  * ldm_validate_partition_table - Determine whether bdev might be a dynamic disk
- * @bdev:  Device to test
+ * @bdev:  Device holding the LDM Database
  *
  * This function provides a weak test to decide whether the device is a dynamic
@@ -633,5 +622,5 @@
 /**
  * ldm_get_disk_objid - Search a linked list of vblk's for a given Disk Id
- * @ldb:  ldmdb struct
+ * @ldb:  Cache of the database structures
  *
  * The LDM Database contains a list of all partitions on all dynamic disks.  The
@@ -658,41 +647,7 @@
 
 /**
- * ldm_create_partition - Create a kernel partition device
- * @hd:     gendisk structure in which to create partition
- * @minor:  Create a this minor number on the device
- * @start:  Offset (in sectors) into the device of the partition
- * @size:   Size (in sectors) of the partition
- *
- * This validates the range, then puts an entry into the kernel's partition
- * table.
- *
- * Return:  TRUE   Created the partition
- *          FALSE  Error
- */
-static BOOL ldm_create_partition (struct gendisk *hd, int minor, int start,
-				  int size)
-{
-	int disk_minor;
-
-	BUG_ON (!hd || !hd->part);
-
-	/* Get the minor number of the parent device
-	 * so we can check we don't go beyond the end of the device.  */
-	disk_minor = (minor >> hd->minor_shift) << hd->minor_shift;
-	if ((start < 1) || ((start + size) > hd->part[disk_minor].nr_sects)) {
-		ldm_crit ("Partition exceeds physical disk. Aborting.");
-		return FALSE;
-	}
-	add_gd_partition (hd, minor, start, size);
-	ldm_debug ("Created partition successfully.");
-	return TRUE;
-}
-
-/**
  * ldm_create_data_partitions - Create data partitions for this device
- * @hd:            gendisk structure in which to create the data partitions
- * @first_sector:  First sector of data on the device
- * @first_minor:   Device minor to be used
- * @ldb:           ldmdb structure
+ * @pp:   List of the partitions parsed so far
+ * @ldb:  Cache of the database structures
  *
  * The database contains ALL the partitions for ALL disk groups, so we need to
@@ -700,6 +655,5 @@
  * the partitions in the database that belong to this disk.
  *
- * For each found partition, we create a corresponding partition device starting
- * with minor number @first_minor.
+ * Add each partition in our database, to the parsed_partitions structure.
  *
  * N.B.  This function creates the partitions in the order it finds partition
@@ -709,14 +663,20 @@
  *          FALSE  Error, probably a range checking problem
  */
-static BOOL ldm_create_data_partitions (struct gendisk *hd,
-	unsigned long first_sector, int first_minor, const struct ldmdb *ldb)
+#ifdef CONFIG_BLK_DEV_MD
+static BOOL ldm_create_data_partitions (struct parsed_partitions *pp,
+					const struct ldmdb *ldb,
+					struct block_device *bdev)
+#else
+static BOOL ldm_create_data_partitions (struct parsed_partitions *pp,
+					const struct ldmdb *ldb)
+#endif
 {
 	struct list_head *item;
-	struct vblk_part *part;
+	struct vblk *vb;
 	struct vblk *disk;
-	int disk_minor;
-	int minor;
+	struct vblk_part *part;
+	int part_num = 1;
 
-	BUG_ON (!hd || !ldb);
+	BUG_ON (!pp || !ldb);
 
 	disk = ldm_get_disk_objid (ldb);
@@ -726,16 +686,11 @@
 	}
 
-	/* We use the range-check the partitions against the parent device. */
-	disk_minor = (first_minor >> hd->minor_shift) << hd->minor_shift;
-	minor = first_minor;
-
 	printk (" [LDM]");
 
 	/* Create the data partitions */
 	list_for_each (item, &ldb->v_part) {
-		struct vblk *vb;
 #ifdef CONFIG_BLK_DEV_MD	/* CONFIG_LDM_MD implies CONFIG_BLK_DEV_MD */
 		struct vblk *v, *c;
-		const kdev_t dev = mk_kdev (hd->major, minor);
+		const kdev_t dev = bdev->bd_inode->i_dev;
 #endif
 		vb = list_entry (item, struct vblk, list);
@@ -745,8 +700,6 @@
 			continue;
 
-		if (!ldm_create_partition (hd, minor,
-		    part->start + ldb->ph.logical_disk_start, part->size))
-			continue;			/* Already logged */
-		minor++;
+		put_partition (pp, part_num, ldb->ph.logical_disk_start +
+				part->start, part->size);
 #ifdef CONFIG_BLK_DEV_MD
 		/* Try to get parent component */
@@ -769,6 +722,6 @@
 			continue;
 		}
-		/* Register to LDM_MD */
 #ifdef CONFIG_LDM_MD
+		/* Register to LDM_MD */
 		ldm_md_addpart (v->vblk.volu.guid, c->obj_id,
 		    c->vblk.comp.type, part->partnum, c->vblk.comp.children,
@@ -776,8 +729,8 @@
 #endif
 #endif
+		part_num++;
 	}
 
 	printk ("\n");
-
 	return TRUE;
 }
@@ -786,8 +739,8 @@
 /**
  * ldm_relative - Calculate the next relative offset
- * @buffer:  The block of data being worked on
- * @buflen:  The size of the block of data
- * @base:    The size of the previous fixed width fields
- * @offset:  The cumulative size of the previous variable-width fields
+ * @buffer:  Block of data being worked on
+ * @buflen:  Size of the block of data
+ * @base:    Size of the previous fixed width fields
+ * @offset:  Cumulative size of the previous variable-width fields
  *
  * Because many of the VBLK fields are variable-width, it's necessary
@@ -796,5 +749,5 @@
  *
  * Return:  -1 Error, the calculated offset exceeded the size of the buffer
- *       :  n OK, a range-checked offset into buffer
+ *           n OK, a range-checked offset into buffer
  */
 static int ldm_relative (const u8 *buffer, int buflen, int base, int offset)
@@ -868,10 +821,9 @@
 	length = block[0];
 	if (length >= buflen) {
-		ldm_error ("String too long for buffer (%d/%d). Truncating.",
-			length, buflen);
+		ldm_error ("Truncating string %d -> %d.", length, buflen);
 		length = buflen - 1;
 	}
 	memcpy (buffer, block + 1, length);
-	buffer[length] = (u8)'\0';
+	buffer[length] = 0;
 	return length;
 }
@@ -880,6 +832,6 @@
 /**
  * ldm_parse_cmp3 - Read a raw VBLK Component object into a vblk structure
- * @buffer:  The block of data being worked on
- * @buflen:  The size of the block of data
+ * @buffer:  Block of data being worked on
+ * @buflen:  Size of the block of data
  * @vb:      In-memory vblk in which to return information
  *
@@ -931,6 +883,6 @@
 /**
  * ldm_parse_dgr3 - Read a raw VBLK Disk Group object into a vblk structure
- * @buffer:  The block of data being worked on
- * @buflen:  The size of the block of data
+ * @buffer:  Block of data being worked on
+ * @buflen:  Size of the block of data
  * @vb:      In-memory vblk in which to return information
  *
@@ -975,6 +927,6 @@
 /**
  * ldm_parse_dgr4 - Read a raw VBLK Disk Group object into a vblk structure
- * @buffer:  The block of data being worked on
- * @buflen:  The size of the block of data
+ * @buffer:  Block of data being worked on
+ * @buflen:  Size of the block of data
  * @vb:      In-memory vblk in which to return information
  *
@@ -1019,6 +971,6 @@
 /**
  * ldm_parse_dsk3 - Read a raw VBLK Disk object into a vblk structure
- * @buffer:  The block of data being worked on
- * @buflen:  The size of the block of data
+ * @buffer:  Block of data being worked on
+ * @buflen:  Size of the block of data
  * @vb:      In-memory vblk in which to return information
  *
@@ -1058,6 +1010,6 @@
 /**
  * ldm_parse_dsk4 - Read a raw VBLK Disk object into a vblk structure
- * @buffer:  The block of data being worked on
- * @buflen:  The size of the block of data
+ * @buffer:  Block of data being worked on
+ * @buflen:  Size of the block of data
  * @vb:      In-memory vblk in which to return information
  *
@@ -1091,6 +1043,6 @@
 /**
  * ldm_parse_prt3 - Read a raw VBLK Partition object into a vblk structure
- * @buffer:  The block of data being worked on
- * @buflen:  The size of the block of data
+ * @buffer:  Block of data being worked on
+ * @buflen:  Size of the block of data
  * @vb:      In-memory vblk in which to return information
  *
@@ -1143,6 +1095,6 @@
 /**
  * ldm_parse_vol5 - Read a raw VBLK Volume object into a vblk structure
- * @buffer:  The block of data being worked on
- * @buflen:  The size of the block of data
+ * @buffer:  Block of data being worked on
+ * @buflen:  Size of the block of data
  * @vb:      In-memory vblk in which to return information
  *
@@ -1212,6 +1164,6 @@
 /**
  * ldm_parse_vblk - Read a raw VBLK object into a vblk structure
- * @buf:  The block of data being worked on
- * @len:  The size of the block of data
+ * @buf:  Block of data being worked on
+ * @len:  Size of the block of data
  * @vb:   In-memory vblk in which to return information
  *
@@ -1264,7 +1216,7 @@
 /**
  * ldm_ldmdb_add - Adds a raw VBLK entry to the ldmdb database
- * @data:  The raw VBLK to add to the database
- * @len:   The size of the raw VBLK
- * @ldb:   ldmdb database containing VBLK lists
+ * @data:  Raw VBLK to add to the database
+ * @len:   Size of the raw VBLK
+ * @ldb:   Cache of the database structures
  *
  * The VBLKs are sorted into categories.  Partitions are also sorted by offset.
@@ -1288,7 +1240,6 @@
 	}
 
-	if (!ldm_parse_vblk (data, len, vb)) {
+	if (!ldm_parse_vblk (data, len, vb))
 		return FALSE;			/* Already logged */
-	}
 
 	/* Put vblk into the correct list. */
@@ -1326,7 +1277,7 @@
 /**
  * ldm_frag_add - Add a VBLK fragment to a list
- * @data:   The raw fragment to be added
- * @size:   The size of the raw fragment
- * @frags:  The list of fragments
+ * @data:   Raw fragment to be added to the list
+ * @size:   Size of the raw fragment
+ * @frags:  Linked list of VBLK fragments
  *
  * Fragmented VBLKs may not be consecutive in the database, so they are placed
@@ -1377,5 +1328,5 @@
 	}
 
-	f->map |= 1 << rec;
+	f->map |= (1 << rec);
 
 	if (num > 0) {
@@ -1390,5 +1341,5 @@
 /**
  * ldm_frag_free - Free a linked list of VBLK fragments
- * @list:  A linked list of fragments
+ * @list:  Linked list of fragments
  *
  * Free a linked list of VBLK fragments
@@ -1408,6 +1359,6 @@
 /**
  * ldm_frag_commit - Validate fragmented VBLKs and add them to the database
- * @frags:  The list of VBLK fragment
- * @ldb:    The ldmdb database
+ * @frags:  Linked list of VBLK fragments
+ * @ldb:    Cache of the database structures
  *
  * Now that all the fragmented VBLKs have been collected, they must be added to
@@ -1421,5 +1372,4 @@
 	struct frag *f;
 	struct list_head *item;
-	BOOL result = FALSE;
 
 	BUG_ON (!frags || !ldb);
@@ -1431,20 +1381,18 @@
 			ldm_error ("VBLK group %d is incomplete (0x%02x).",
 				f->group, f->map);
-			goto out;
+			return FALSE;
 		}
 
 		if (!ldm_ldmdb_add (f->data, f->num*ldb->vm.vblk_size, ldb))
-			goto out;
+			return FALSE;		/* Already logged */
 	}
-	result = TRUE;
-out:
-	return result;
+	return TRUE;
 }
 
 /**
  * ldm_get_vblks - Read the on-disk database of VBLKs into memory
- * @bdev:  The block device to read from
- * @base:  The offset, into @bdev, of the database
- * @ldb:   The database to store the parsed VBLKs
+ * @bdev:  Device holding the LDM Database
+ * @base:  Offset, into @bdev, of the database
+ * @ldb:   Cache of the database structures
  *
  * To use the information from the VBLKs, they need to be read from the disk,
@@ -1467,6 +1415,6 @@
 	size   = ldb->vm.vblk_size;
 	perbuf = 512 / size;
-	skip   = ldb->vm.vblk_offset / 512;
-	finish = (size * ldb->vm.last_vblk_seq) / 512;
+	skip   = ldb->vm.vblk_offset >> 9;		/* Bytes to sectors */
+	finish = (size * ldb->vm.last_vblk_seq) >> 9;
 
 	for (s = skip; s < finish; s++) {		/* For each sector */
@@ -1527,8 +1475,6 @@
 /**
  * ldm_partition - Find out whether a device is a dynamic disk and handle it
- * @hd:            gendisk structure in which to return the handled disk
- * @bdev:          Device we need to look at
- * @first_sector:  First sector within the device
- * @first_minor:   First minor number of partitions for the device
+ * @pp:    List of the partitions parsed so far
+ * @bdev:  Device holding the LDM Database
  *
  * This determines whether the device @bdev is a dynamic disk and if so creates
@@ -1545,12 +1491,17 @@
  *            Or @bdev is a dynamic disk, but it may be corrupted
  */
-int ldm_partition (struct gendisk *hd, struct block_device *bdev,
-	unsigned long first_sector, int first_minor)
+#ifdef CONFIG_LDM_EXPORT_SYMBOLS
+int ldm_partition (struct parsed_partitions *pp, struct block_device *bdev, struct ldmdb *ldb)
+#else
+int ldm_partition (struct parsed_partitions *pp, struct block_device *bdev)
+#endif
 {
+#ifndef CONFIG_LDM_EXPORT_SYMBOLS
 	struct ldmdb  *ldb;
+#endif
 	unsigned long base;
-	int err = -1;
+	int result = -1;
 
-	BUG_ON (!hd || !bdev);
+	BUG_ON (!pp || !bdev);
 
 	/* Look for signs of a Dynamic Disk */
@@ -1558,4 +1509,5 @@
 		return 0;
 
+#ifndef CONFIG_LDM_EXPORT_SYMBOLS
 	ldb = kmalloc (sizeof (*ldb), GFP_KERNEL);
 	if (!ldb) {
@@ -1563,18 +1515,20 @@
 		goto out;
 	}
+#endif
 
 	/* Parse and check privheads. */
-	if (!ldm_validate_privheads (bdev, first_sector, &ldb->ph, hd, first_minor))
-		goto out;
+	if (!ldm_validate_privheads (bdev, &ldb->ph))
+		goto out;		/* Already logged */
 
 	/* All further references are relative to base (database start). */
-	base = first_sector + ldb->ph.config_start;
+	base = ldb->ph.config_start;
 
 	/* Parse and check tocs and vmdb. */
 	if (!ldm_validate_tocblocks (bdev, base, ldb) ||
 	    !ldm_validate_vmdb      (bdev, base, ldb))
-	    	goto out;
+	    	goto out;		/* Already logged */
 
 	/* Initialize vblk lists in ldmdb struct */
+#ifndef CONFIG_LDM_EXPORT_SYMBOLS
 	INIT_LIST_HEAD (&ldb->v_dgrp);
 	INIT_LIST_HEAD (&ldb->v_disk);
@@ -1582,4 +1536,5 @@
 	INIT_LIST_HEAD (&ldb->v_comp);
 	INIT_LIST_HEAD (&ldb->v_part);
+#endif
 
 	if (!ldm_get_vblks (bdev, base, ldb)) {
@@ -1589,11 +1544,16 @@
 
 	/* Finally, create the data partition devices. */
-	if (ldm_create_data_partitions (hd, first_sector, first_minor, ldb)) {
+#ifdef CONFIG_BLK_DEV_MD
+	if (ldm_create_data_partitions (pp, ldb, bdev)) {
+#else
+	if (ldm_create_data_partitions (pp, ldb)) {
+#endif
 		ldm_debug ("Parsed LDM database successfully.");
-		err = 1;
+		result = 1;
 	}
 	/* else Already logged */
 
 cleanup:
+#ifndef CONFIG_LDM_EXPORT_SYMBOLS
 	ldm_free_vblks (&ldb->v_dgrp);
 	ldm_free_vblks (&ldb->v_disk);
@@ -1601,6 +1561,10 @@
 	ldm_free_vblks (&ldb->v_comp);
 	ldm_free_vblks (&ldb->v_part);
+#endif
 out:
+#ifndef CONFIG_LDM_EXPORT_SYMBOLS
 	kfree (ldb);
-	return err;
+#endif
+	return result;
 }
+

Index: ldm.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -U2 -r1.49 -r1.50
--- ldm.h	21 Jun 2002 14:31:44 -0000	1.49
+++ ldm.h	5 Aug 2002 15:46:50 -0000	1.50
@@ -1,5 +1,2 @@
-#ifndef _FS_PT_LDM_H_
-#define _FS_PT_LDM_H_
-
 /**
  * ldm - Part of the Linux-NTFS project.
@@ -27,4 +24,7 @@
  */
 
+#ifndef _FS_PT_LDM_H_
+#define _FS_PT_LDM_H_
+
 #include <linux/types.h>
 #include <linux/list.h>
@@ -34,4 +34,6 @@
 #include <asm/byteorder.h>
 
+struct parsed_partitions;
+
 /* Magic numbers in CPU format. */
 #define MAGIC_VMDB	0x564D4442		/* VMDB */
@@ -213,6 +215,9 @@
 };
 
-int ldm_partition (struct gendisk *hd, struct block_device *bdev,
-		unsigned long first_sector, int first_minor);
+#ifdef CONFIG_LDM_EXPORT_SYMBOLS
+int ldm_partition (struct parsed_partitions *pp, struct block_device *bdev, struct ldmdb *ldb);
+#else
+int ldm_partition (struct parsed_partitions *pp, struct block_device *bdev);
+#endif
 
 #endif /* _FS_PT_LDM_H_ */

[Linux-NTFS-cvs] CVS: dynamic-disk/test compat.c,1.17,1.18 extra.h,1.4,1.5 ldminfo.c,1.32,1.33 ldminfo.h,1.19,1.20

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk/test
In directory usw-pr-cvs1:/tmp/cvs-serv5436/test

Modified Files:
	compat.c extra.h ldminfo.c ldminfo.h 
Log Message:
tidy ups, build fixes


Index: compat.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/compat.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -U2 -r1.17 -r1.18
--- compat.c	20 Jun 2002 18:04:55 -0000	1.17
+++ compat.c	5 Aug 2002 15:46:51 -0000	1.18
@@ -82,4 +82,7 @@
 		return 0;
 
+	if ((!debug) && (buf[0] == ' ') && isdigit(buf[1]))
+		return 0;
+
 	if (ignore) {
 		ignore = (strchr (buf, '\n') == NULL);
@@ -98,14 +101,24 @@
 }
 
+void __brelse (struct buffer_head * buf)
+{
+	if (buf) {
+		kfree (buf->b_data);
+		kfree (buf);
+	}
+}
+
+#ifdef CONFIG_BLK_DEV_MD
+void md_autodetect_dev(kdev_t dev)
+{
+}
+#endif
+
 struct buffer_head * ldm_bread (kdev_t dev, int block, int size)
 {
 	struct buffer_head *bh;
-	int m;
 	long long offset;
 
-	m = minor (dev);
-	offset = hd[m].start_sect;
-	offset <<= 9;
-	offset += (((long long) block) * size);
+	offset = (((long long) block) * size);
 
 	bh = kmalloc (sizeof (*bh), 0);
@@ -129,24 +142,4 @@
 }
 
-void __brelse (struct buffer_head * buf)
-{
-	if (buf) {
-		kfree (buf->b_data);
-		kfree (buf);
-	}
-}
-
-void add_gd_partition(struct gendisk *hd, int m, int start, int size)
-{
-	hd->part[m].start_sect = start;
-	hd->part[m].nr_sects   = size;
-}
-
-#ifdef CONFIG_BLK_DEV_MD
-void md_autodetect_dev(kdev_t dev)
-{
-}
-#endif
-
 unsigned char *read_dev_sector (struct block_device *bdev, unsigned long n, Sector *sect)
 {
@@ -207,3 +200,13 @@
 	__free_pages((page), 0);
 }
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,28)
+void put_partition(struct parsed_partitions *p, int n, int from, int size)
+{
+	if (n < p->limit) {
+		p->parts[n].from = from;
+		p->parts[n].size = size;
+	}
+}
+#endif
 

Index: extra.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/extra.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- extra.h	17 Jun 2002 00:15:13 -0000	1.4
+++ extra.h	5 Aug 2002 15:46:51 -0000	1.5
@@ -20,4 +20,19 @@
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,28)
+#define MAX_PART 256
+struct parsed_partitions {
+	char name[40];
+	struct {
+		unsigned long from;
+		unsigned long size;
+		int flags;
+	} parts[MAX_PART];
+	int next;
+	int limit;
+};
+void put_partition(struct parsed_partitions *p, int n, int from, int size);
+#endif
+
 #include <linux/slab.h>
 #include <linux/pagemap.h>
@@ -43,4 +58,9 @@
 void page_cache_release (struct page *page);
 void __free_page (struct page *page);
+
+#include <linux/list.h>
+
+#undef list_for_each
+#define list_for_each(pos, head) for (pos = (head)->next; pos != (head); pos = pos->next)
 
 #endif /* _LDM_EXTRA_H_ */

Index: ldminfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/ldminfo.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -U2 -r1.32 -r1.33
--- ldminfo.c	24 Jun 2002 12:59:28 -0000	1.32
+++ ldminfo.c	5 Aug 2002 15:46:51 -0000	1.33
@@ -23,25 +23,10 @@
 
 #include "ldminfo.h"
-
-int * hardsect_size[255];
-int * blk_size     [255];
-int * blksize_size [255];
-
-struct hd_struct hd      [256];
-int              hd_sizes[256];
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,2)
-struct gendisk   hd_gendisk = { 3, "hd", 6, 64, hd, hd_sizes };
-#else
-struct gendisk   hd_gendisk = { 3, "hd", 6, hd, hd_sizes };
-#endif
-
-
-int ldm_parse_vmdb(const u8 *buffer, struct vmdb *vm);
+#include "check.h"
 
 /**
  * dump_info - Display a list of partitions, a la fdisk
  */
-void dump_info (char *name, int maxminor)
+void dump_info (char *name, struct parsed_partitions *pp)
 {
 	int i;
@@ -55,21 +40,20 @@
 	for (i = 0; i < 256; i++) {
 		char buf[16];
-		int minor = i % maxminor;
 		long long start;
 		long long size;
 
-		if (hd[i].nr_sects == 0)
-			continue;
+		if (pp->parts[i].size == 0)
+			break;
 
-		if (minor)
+		if (i)
 			if (numeric)
-				sprintf (buf, "%.10sp%d", name, minor);
+				sprintf (buf, "%.10sp%d", name, i);
 			else
-				sprintf (buf, "%.10s%d", name, minor);
+				sprintf (buf, "%.10s%d", name, i);
 		else
 			sprintf (buf, "%.10s", name);
 
-		start = hd[i].start_sect; start <<= 9;
-		size  = hd[i].nr_sects;   size  <<= 9;
+		start = pp->parts[i].from; start <<= 9;
+		size  = pp->parts[i].size; size  <<= 9;
 		printf ("%-12.12s | %12lld %10lld %6lld | %12lld %10lld %6lld\n", buf, start, start>>9, start>>20, size, size>>9, size>>20);
 	}
@@ -78,58 +62,9 @@
 
 /**
- * ldm_partition2
- *
- * This is here so we can extract the structs from the kernel part
- */
-int ldm_partition2 (struct gendisk *hd, struct block_device *bdev, struct ldmdb *ldb,
-		    int first_minor)
-{
-	struct vblk   *disk;
-	unsigned long base;
-	int err = -1;
-
-	if (!ldm_validate_partition_table (bdev))
-		return -1;
-
-	if (!ldm_validate_privheads (bdev, 0, &ldb->ph, hd, first_minor))
-		return -1;
-
-	/* All further references are relative to base (database start). */
-	base = ldb->ph.config_start;
-
-	/* Parse and check tocs and vmdb. */
-	if (!ldm_validate_tocblocks (bdev, base, ldb) ||
-	    !ldm_validate_vmdb      (bdev, base, ldb))
-	    	return -1;
-
-	if (!ldm_get_vblks (bdev, base, ldb)) {
-		printk (LDM_CRIT "get vblks failed\n");
-		goto free_buffers;
-	}
-
-	disk = ldm_get_disk_objid (ldb);
-	if (!disk) {
-		printk ("can't find this disk\n");
-		goto free_buffers;
-	}
-
-	// FIXME first_sector / 0?
-	if (ldm_create_data_partitions (hd, 0, first_minor, ldb, disk))
-		err = 1;
-
-free_buffers:
-	//FIXME no buffers to free
-	return err;
-}
-
-/**
  * main - ldminfo entry point
  */
 int main (int argc, char *argv[])
 {
-	int minor = 64;
-	kdev_t drive = mk_kdev(3,minor);	/* hdb */
 	int a;
-	int maxminor = 64;
 	int info  = 0;
 	int dump  = 0;
@@ -138,4 +73,5 @@
 	int ver   = 0;
 	struct block_device bdev;
+	struct inode ino;
 	struct stat64 st;
 
@@ -151,11 +87,4 @@
 	}
 
-	/*
-	if (help || ver) {
-		printf ("\nGDB is free software, covered by the GNU General Public License, and you are\n");
-		printf ("welcome to change it and/or distribute copies of it under certain conditions.\n");
-	}
-	*/
-
 	if (help || (argc - info - dump - copy - debug) < 2) {
 		printf ("\nUsage:\n    %s [options] device ...\n", basename (argv[0]));
@@ -178,4 +107,5 @@
 		long long size;
 		struct ldmdb     ldb; //FIXME move to heap
+		struct parsed_partitions pp;
 
 		if (!argv[a][0])
@@ -216,27 +146,24 @@
 		INIT_LIST_HEAD(&ldb.v_part);
 
-		memset (hardsect_size, 0, sizeof (hardsect_size));
-		memset (blk_size,      0, sizeof (blk_size));
-		memset (blksize_size,  0, sizeof (blksize_size));
-		memset (hd,            0, sizeof (hd));
-		memset (hd_sizes,      0, sizeof (hd_sizes));
-
-		hd_gendisk.part[minor].nr_sects = size >> 9;
-		hd_gendisk.sizes[minor] = size >> (BLOCK_SIZE_BITS - 9);
-		blk_size[major(drive)] = hd_gendisk.sizes;
-		bdev.bd_dev = kdev_val(drive);	 /* hack (bd_dev isn't a kdev_t) */
+		memset (&bdev, 0, sizeof (bdev));
+		bdev.bd_inode = &ino;
+		ino.i_size = size;
+
+		memset (&pp, 0, sizeof (pp));
+		pp.parts[0].from = 0;
+		pp.parts[0].size = size >> 9;
+		pp.limit = 255;
 
-		if (ldm_partition2 (&hd_gendisk, &bdev, &ldb, minor + 1) != 1) {
+		if (ldm_partition (&pp, &bdev, &ldb) != 1) {
 			printf ("Something went wrong, skipping device '%s'\n", argv[a]);
-			continue;
+			goto free;
 		}
 
-#if 1
 		if (dump)
 			dump_database (argv[a], &ldb);
 		else
-			dump_info     (argv[a], maxminor);
-#endif
+			dump_info     (argv[a], &pp);
 
+free:
 		ldm_free_vblks(&ldb.v_dgrp);
 		ldm_free_vblks(&ldb.v_disk);

Index: ldminfo.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/ldminfo.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -U2 -r1.19 -r1.20
--- ldminfo.h	24 Jun 2002 12:59:28 -0000	1.19
+++ ldminfo.h	5 Aug 2002 15:46:51 -0000	1.20
@@ -20,26 +20,8 @@
 #include "../linux/fs/partitions/ldm.h"
 
-#ifndef minor
-#define minor MINOR
-#endif
-
-#ifndef major
-#define major MAJOR
-#endif
-
-#ifndef mk_kdev
-#define mk_kdev MKDEV
-#endif
-
 #ifndef BOOL
 typedef unsigned char	BOOL;
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,3)
-#define kdev_val(X) (unsigned short)(X)
-#else
-#define kdev_val(X) ((X).value)
-#endif
-
 #define LDM_CRIT	KERN_CRIT
 #define LDM_ERR		KERN_ERR
@@ -47,12 +29,4 @@
 #define LDM_DEBUG	KERN_DEBUG
 
-extern int * hardsect_size[255];
-extern int * blk_size     [255];
-extern int * blksize_size [255];
-
-extern struct hd_struct	hd      [256];
-extern int              hd_sizes[256];
-extern struct gendisk   hd_gendisk;
-
 extern int device;
 extern int debug;
@@ -65,48 +39,13 @@
 extern int ldm_mem_maxc;
 
-extern struct proc_dir_entry *proc_root_fs;
-
-struct tm
-{
-	int tm_sec;		/* Seconds */
-	int tm_min;		/* Minutes */
-	int tm_hour;		/* Hours */
-	int tm_mday;		/* Day */
-	int tm_mon;		/* Month */
-	int tm_year;		/* Year */
-	int tm_wday;		/* Day of week */
-	int tm_yday;		/* Days in year */
-	int tm_isdst;		/* DST */
-	long int tm_gmtoff;	/* Seconds east of UTC */
-	const char *tm_zone;	/* Timezone abbreviation */
-};
-
 void dump_database (char *name, struct ldmdb *ldb);
 void copy_database (char *file, int fd, long long size);
-struct buffer_head * ldm_bread (kdev_t dev, int block, int size);
-
-BOOL ldm_create_partition (struct gendisk *hd, int minor, int start, int size);
-BOOL ldm_create_data_partitions (struct gendisk *hd, unsigned long first_sector, int first_minor, const struct ldmdb *ldb, const struct vblk *disk);
-int ldm_validate_privheads (struct block_device *bdev, unsigned long base, const struct privhead *ph1, struct gendisk *hd, unsigned long first_minor);
-int ldm_validate_tocblocks (struct block_device *bdev, unsigned long base, struct ldmdb *ldb);
-int ldm_validate_vmdb (struct block_device *bdev, unsigned long base, struct ldmdb *ldb);
-int ldm_get_buffers (struct block_device *bdev, unsigned long base, struct vmdb *vm, struct list_head *lh_bh, struct list_head *lh_vl);
-struct vblk * ldm_get_disk_objid (const struct ldmdb *ldb);
-void ldm_free_buffers (struct list_head *bh);
 void ldm_free_vblks (struct list_head *vb);
-int ldm_get_vblks(struct block_device *bdev, unsigned long base, struct ldmdb *ldb);
-int ldm_combine_vblks (struct ldmdb *ldb);
-int ldm_validate_partition_table (struct block_device *bdev);
 
-void		exit	(int);
 int		open64	(const char *file, int oflag, ...);
 long long	lseek64 (int fd, long long offset, int whence);
 int		stat64  (const char *file, struct stat64 *buf);
-ssize_t		read	(int fd, void *buf, size_t count);
-int		close	(int fd);
-struct tm *	localtime(const time_t *timer);
 int		isdigit	(int c);
 char *		basename(const char *filename);
-int		stat    (const char *file_name, struct stat *buf);
 
 #endif // __LDMINFO_H_