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

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4 Makefile,1.3,1.4

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4
In directory usw-pr-cvs1:/tmp/cvs-serv16506

Modified Files:
	Makefile 
Log Message:
oops.


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- Makefile	2001/06/25 00:02:22	1.3
+++ Makefile	2001/06/25 00:04:45	1.4
@@ -12,5 +12,5 @@
 
 # Enable write support (DANGEROUS)? (yes/no)
-NTFS_WRITE_SUPPORT = yes
+NTFS_WRITE_SUPPORT = no
 
 #-------------------------------------------------------------------------------

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4 INSTALL,1.3,1.4 Makefile,1.2,1.3 README,1.5,1.6

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4
In directory usw-pr-cvs1:/tmp/cvs-serv16161

Modified Files:
	INSTALL Makefile README 
Log Message:
Update text files


Index: INSTALL
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/INSTALL,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- INSTALL	2001/06/24 01:14:56	1.3
+++ INSTALL	2001/06/25 00:02:22	1.4
@@ -28,4 +28,22 @@
 partition with the standard mount -t ntfs command.
 
+The final alternative is to build the module in place without touching the
+kernel. To do this edit the Makefile and change the line "TARGET = ..." to
+"TARGET = build-module", then run "make". Or just run "make build-module" if you
+don't want to edit the Makefile. This will build the module in place and if
+all goes well you will find ntfs.o in the current directory. You can now insert
+the module with "insmod ntfs.o" and check it loaded with "lsmod".
+
+Note that you need to at least have your configured kernel sources and you need
+to have at least run "make dep" for the make in place to work. If you have
+configured NTFS write support into your kernel then the module will be built
+with write support enabled regardless of the setting in the local Makefile.
+
+Note also that when building the module in place, you might want to edit the
+Makefile in order to specify where your kernel sources are, whether your kernel
+has modversions enabled (probably yes) and whether you want to enable NTFS
+write support (this is very dangerous and can result in total data loss on the
+NTFS partition you write to, so don't do it unless you have backups).
+
 WARNING/NOTES: When mounting NTFS partitions it is advisable to use the options:
 	-o ro,show_sys_files

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- Makefile	2001/06/24 17:41:00	1.2
+++ Makefile	2001/06/25 00:02:22	1.3
@@ -12,5 +12,5 @@
 
 # Enable write support (DANGEROUS)? (yes/no)
-NTFS_WRITE_SUPPORT = no
+NTFS_WRITE_SUPPORT = yes
 
 #-------------------------------------------------------------------------------

Index: README
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- README	2001/06/24 01:14:56	1.5
+++ README	2001/06/25 00:02:22	1.6
@@ -10,5 +10,6 @@
 sources directory or you just run "make" which will create symbolic links into
 your kernel tree (see INSTALL file for detailed instructions on installing
-and using the driver).
+and using the driver). It is also possible to compile the module outside the
+kernel source tree. See the INSTALL file for details.
 
 WARNING: Mount NTFS partitions read-only as the current driver will cause

[Linux-NTFS-cvs] CVS: dynamic-disk/linux/Documentation Configure.help,1.3,1.4

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

Changes by: flatcap

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

Modified Files:
	Configure.help 
Log Message:
add LDM to dictionary


Index: Configure.help
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/Documentation/Configure.help,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- Configure.help	2001/06/21 01:08:04	1.3
+++ Configure.help	2001/06/24 18:21:38	1.4
@@ -22020,5 +22020,5 @@
 # LocalWords:  DMX Domex dmx wellington ftdi sio Accton Billington Corega FEter
 # LocalWords:  MELCO LUA PNA Linksys SNC chkdsk AWACS Webcam RAMFS Ramfs ramfs
-# LocalWords:  ramfiles MAKEDEV pty WDTPCI APA apa
+# LocalWords:  ramfiles MAKEDEV pty WDTPCI APA apa LDM
 #
 # The following sets edit modes for GNU EMACS

[Linux-NTFS-cvs] CVS: dynamic-disk/linux/fs/partitions Config.in,1.1,1.2

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

Changes by: flatcap

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

Modified Files:
	Config.in 
Log Message:
make sure we only enable LDM if EXPERIMENTAL is set


Index: Config.in
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/Config.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- Config.in	2001/06/16 22:54:54	1.1
+++ Config.in	2001/06/24 18:14:48	1.2
@@ -26,5 +26,5 @@
       bool '    Unixware slices support' CONFIG_UNIXWARE_DISKLABEL
    fi
-   bool '  Windows Logical Disk Manager (Dynamic Disk) support' CONFIG_LDM_PARTITION
+   dep_bool '  Windows Logical Disk Manager (Dynamic Disk) support' CONFIG_LDM_PARTITION $CONFIG_EXPERIMENTAL
    bool '  SGI partition support' CONFIG_SGI_PARTITION
    bool '  Ultrix partition table support' CONFIG_ULTRIX_PARTITION

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4/linux/fs/ntfs fs.c,1.5,1.6

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

Changes by: flatcap

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv18654/linux/fs/ntfs

Modified Files:
	fs.c 
Log Message:
change around the build a bit
now you can build locally or install the source in the linux tree


Index: fs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/linux/fs/ntfs/fs.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- fs.c	2001/06/23 21:10:40	1.5
+++ fs.c	2001/06/24 17:41:00	1.6
@@ -426,5 +426,5 @@
 
 static struct file_operations ntfs_file_operations_nommap = {
-	llseek:		generic_file_llseek,
+	/*llseek:		generic_file_llseek,*/
 	read:		ntfs_read,
 #ifdef CONFIG_NTFS_RW

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4 Makefile.module,NONE,1.1 BUGS,1.2,1.3 ChangeLog,1.2,1.3 Makefile,1.1,1.2

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

Changes by: flatcap

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4
In directory usw-pr-cvs1:/tmp/cvs-serv18654

Modified Files:
	BUGS ChangeLog Makefile 
Added Files:
	Makefile.module 
Log Message:
change around the build a bit
now you can build locally or install the source in the linux tree


--- NEW FILE ---
# Copyright (C) 2001 Richard Russon

SRCDIR	= linux/fs/ntfs

SRC	= $(SRCDIR)/attr.c	 $(SRCDIR)/support.c	\
	  $(SRCDIR)/dir.c	 $(SRCDIR)/sysctl.c	\
	  $(SRCDIR)/fs.c	 $(SRCDIR)/unistr.c	\
	  $(SRCDIR)/inode.c	 $(SRCDIR)/util.c	\
	  $(SRCDIR)/super.c

HDR	= $(SRCDIR)/attr.h	 $(SRCDIR)/struct.h 	\
	  $(SRCDIR)/dir.h	 $(SRCDIR)/super.h  	\
	  $(SRCDIR)/inode.h	 $(SRCDIR)/support.h	\
	  $(SRCDIR)/macros.h	 $(SRCDIR)/sysctl.h 	\
	  $(SRCDIR)/ntfsendian.h $(SRCDIR)/unistr.h   	\
	  $(SRCDIR)/ntfstypes.h	 $(SRCDIR)/util.h

OBJ	= $(SRC:.c=.o)

OUT	= ntfs.o

CC	= gcc
LD	= ld
RM	= rm -f
CP	= cp

ARCH	= $(shell uname -m)

INCLUDE	= linux/include
LFLAGS	= -m elf_i386 -r

CFLAGS += -D__KERNEL__

CFLAGS += -DNTFS_VERSION=\"1.1.16\"

CFLAGS += -Wall
CFLAGS += -Wstrict-prototypes
CFLAGS += -O2
CFLAGS += -fomit-frame-pointer
CFLAGS += -fno-strict-aliasing
CFLAGS += -pipe
CFLAGS += -mpreferred-stack-boundary=2
CFLAGS += -march=$(ARCH)

CFLAGS += -I.
CFLAGS += -I$(INCLUDE)

CFLAGS += -DMODULE
ifeq "$(MODULE_VERSIONS)" "yes"
CFLAGS += -DMODVERSIONS
CFLAGS += -include $(KERNEL_SOURCE)/include/linux/modversions.h
endif

ifeq "$(NTFS_WRITE_SUPPORT)" "yes"
CFLAGS += -DCONFIG_NTFS_RW
endif

# a desperate attempt to stop the kernel defaults overriding ours
CFLAGS += -D_LINUX_CONFIG_H

CFLAGS += -include $(INCLUDE)/linux/ntfs_fs.h
CFLAGS += -include $(INCLUDE)/linux/ntfs_fs_i.h
CFLAGS += -include $(INCLUDE)/linux/ntfs_fs_sb.h

all:	$(SRCDIR)/$(OUT) $(OUT)

$(SRCDIR)/$(OUT): $(OBJ)
	$(RM) $(SRCDIR)/$(OUT)
	$(LD) $(LFLAGS) -o $(SRCDIR)/$(OUT) $(OBJ)

$(OUT): $(SRCDIR)/$(OUT)
	$(CP) $(SRCDIR)/$(OUT) $(OUT)
	@echo
	@echo Stripping ntfs.o will stop the module working
	@echo

.c.o:
	$(CC) $(CFLAGS) -c $< -o $@

clean:
	$(RM) $(OUT) $(OBJ) $(SRCDIR)/$(OUT)

distclean: clean

#force:
#install:
#install-source:
#mount:
#tags:
#umount:


Index: BUGS
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/BUGS,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- BUGS	2001/06/23 00:51:00	1.2
+++ BUGS	2001/06/24 17:41:00	1.3
@@ -10,5 +10,5 @@
   as the sytem files.)
 
-- Writting of extension records is not supported properly.
+- Writing of extension records is not supported properly.
 
 Please send bug reports/comments/feed back/abuse to the Linux-NTFS development

Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- ChangeLog	2001/06/23 00:51:00	1.2
+++ ChangeLog	2001/06/24 17:41:00	1.3
@@ -1,4 +1,4 @@
 
-20/05/2001 - Changes between Linux kernel 2.4.4' NTFS and NTFS 1.1.15:
+20/05/2001 - Changes between Linux kernel 2.4.4' NTFS and NTFS 1.1.16:
 
 	- New mount option show_sys_files=<bool> to show all system files as

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- Makefile	2001/06/24 01:14:56	1.1
+++ Makefile	2001/06/24 17:41:00	1.2
@@ -1,15 +1,56 @@
+# Set your default target:
+#     build-module       Build the module locally
+#     install-source     Copy the source code to the linux source tree
+#                        and build the whole kernel there
+TARGET	= install-source
+
 # Modify this to point to your kernel sources.
-KERNEL_SOURCES = /usr/src/linux
+KERNEL_SOURCE = /usr/src/linux
+
+# Enable Module Versions? (yes/no)
+MODULE_VERSIONS	= yes
+
+# Enable write support (DANGEROUS)? (yes/no)
+NTFS_WRITE_SUPPORT = no
 
+#-------------------------------------------------------------------------------
+
+export KERNEL_SOURCE MODULE_VERSIONS NTFS_WRITE_SUPPORT
+
 OUR_DIR = $(shell pwd)
+LINKS	= docs include src
 
-all:
+all:	$(TARGET)
+	
+install-source:
 	@chmod +x scripts/make_ntfs_sym_links
 	@echo "Creating symbolic links to driver sources."
-	@scripts/make_ntfs_sym_links $(KERNEL_SOURCES) $(OUR_DIR)
+	@scripts/make_ntfs_sym_links $(KERNEL_SOURCE) $(OUR_DIR)
 	@echo "Done."
 	@echo "Assuming ntfs is already configured in your kernel and the kernel is compiled"
 	@echo "you now need to do:"
-	@echo "        cd $(KERNEL_SOURCES) && make modules && make modules_install"
+	@echo "        cd $(KERNEL_SOURCE) && make modules && make modules_install"
 	@echo "Then do \"modprobe ntfs\" followed by \"lsmod\" to check ntfs module is inserted."
+
+build-module:
+	make -f Makefile.module
+
+links:	$(LINKS)
+
+docs:
+	ln -sf linux/Documentation/filesystems docs
+
+include:
+	ln -sf linux/include/linux include
+
+src:
+	ln -sf linux/fs/ntfs src
+
+clean:
+	make -f Makefile.module clean
+
+distclean:
+	make -f Makefile.module distclean
+	rm -f $(LINKS)
+	find . -name tags -exec rm -f {} \;
 

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4/scripts make_ntfs_sym_link,NONE,1.1 make_ntfs_sym_links,NONE,1.1

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv24482/scripts

Added Files:
	make_ntfs_sym_link make_ntfs_sym_links 
Log Message:
New make process which just creates sumbolic links into the kernel sources
which also allows for easy development.


--- NEW FILE ---
#!/bin/bash

if [ $# -ne 3 ]; then {
	echo "This should not be called directly."
	exit 1
}; fi

is_cvs_there=`grep -v CVS <<MY_END
$1
MY_END`

if [ -z $is_cvs_there ]; then exit 0; fi

dest=`echo $1 | sed s#linux/##`

if [ -e $2/$dest ]; then rm -f $2/$dest; fi

ln -s $3/$1 $2/$dest


--- NEW FILE ---
#!/bin/bash

if [ $# -ne 2 ]; then {
	echo "This should not be called directly."
	exit 1
}; fi

if [ ! -d $1 ]; then {
	echo $1 does not exist. Please edit $2/Makefile.
	exit 1
}; fi

chmod +x $2/scripts/make_ntfs_sym_link

pushd . > /dev/null

cd $2

find linux -type f -exec $2/scripts/make_ntfs_sym_link "{}" $1 $2 \;

popd > /dev/null

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4 Makefile,NONE,1.1 INSTALL,1.2,1.3 README,1.4,1.5

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4
In directory usw-pr-cvs1:/tmp/cvs-serv24482

Modified Files:
	INSTALL README 
Added Files:
	Makefile 
Log Message:
New make process which just creates sumbolic links into the kernel sources
which also allows for easy development.


--- NEW FILE ---
# Modify this to point to your kernel sources.
KERNEL_SOURCES = /usr/src/linux

OUR_DIR = $(shell pwd)

all:
	@chmod +x scripts/make_ntfs_sym_links
	@echo "Creating symbolic links to driver sources."
	@scripts/make_ntfs_sym_links $(KERNEL_SOURCES) $(OUR_DIR)
	@echo "Done."
	@echo "Assuming ntfs is already configured in your kernel and the kernel is compiled"
	@echo "you now need to do:"
	@echo "        cd $(KERNEL_SOURCES) && make modules && make modules_install"
	@echo "Then do \"modprobe ntfs\" followed by \"lsmod\" to check ntfs module is inserted."


Index: INSTALL
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/INSTALL,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- INSTALL	2001/06/23 23:12:46	1.2
+++ INSTALL	2001/06/24 01:14:56	1.3
@@ -5,16 +5,26 @@
 directories are layed out exactly like in the kernel so that to install this
 driver you just do:
-
 	cd ntfs-driver-2.4
 	cp -ar linux /usr/src/linux/
+replacing /usr/src/linux/ with the path to your 2.4.x kernel sources.
 
-replacing /usr/src/linux/ with the path to your 2.4.x kernel sources. Then:
+Alternatively, edit the Makefile and adapt to reflect the location of your
+2.4.x kernel sources (only necessary if they are not in /usr/src/linux). Then
+run:
+	make
+This will create symbolic links to the driver source files into your kernel
+sources.
 
+Then:
 	cd /usr/src/linux	(or wherever your kernel sources are)
-	make oldconfig && make dep && make bzImage && make modules && \
-	make modules_install
-	<install new kernel, run lilo, reboot into new kernel>
+	make oldconfig && make dep && make bzImage 	(*)
+	make modules && make modules_install
+	<install new kernel, run lilo, reboot into new kernel	(*)>
+Lines marked (*) are only needed if you have not already configured, compiled
+and are already running this kernel.
 
-And you are all set.
+You should now be all set and can try "modprobe ntfs" followed by "lsmod" to
+insert the module and check it loaded. Now you are ready to mount an NTFS
+partition with the standard mount -t ntfs command.
 
 WARNING/NOTES: When mounting NTFS partitions it is advisable to use the options:

Index: README
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- README	2001/06/23 23:12:46	1.4
+++ README	2001/06/24 01:14:56	1.5
@@ -8,5 +8,6 @@
 directories are layed out exactly like in the kernel so that to install this
 driver you just copy the linux directory inside ntfs-driver-2.4 to your kernel
-sources directory (see INSTALL file for detailed instructions on installing
+sources directory or you just run "make" which will create symbolic links into
+your kernel tree (see INSTALL file for detailed instructions on installing
 and using the driver).
 

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4 Makefile.in,1.3,NONE Makefile.module.in,1.3,NONE

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4
In directory usw-pr-cvs1:/tmp/cvs-serv8159

Removed Files:
	Makefile.in Makefile.module.in 
Log Message:
Missed those


--- Makefile.in DELETED ---

--- Makefile.module.in DELETED ---

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4 INSTALL,1.1,1.2 README,1.3,1.4 configure,1.2,NONE configure.in,1.2,NONE

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4
In directory usw-pr-cvs1:/tmp/cvs-serv7531

Modified Files:
	INSTALL README 
Removed Files:
	configure configure.in 
Log Message:
Remove the make process (slight flaw with module_init not being compiled for
some reason).


Index: INSTALL
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- INSTALL	2001/06/11 21:06:20	1.1
+++ INSTALL	2001/06/23 23:12:46	1.2
@@ -7,5 +7,5 @@
 
 	cd ntfs-driver-2.4
-	cp -ar Documentation include fs /usr/src/linux/
+	cp -ar linux /usr/src/linux/
 
 replacing /usr/src/linux/ with the path to your 2.4.x kernel sources. Then:

Index: README
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- README	2001/06/11 20:29:21	1.3
+++ README	2001/06/23 23:12:46	1.4
@@ -7,5 +7,5 @@
 ntfs-driver-2.4 contains the latest NTFS driver for Linux kernel 2.4.x. The
 directories are layed out exactly like in the kernel so that to install this
-driver you just copy all the directories inside ntfs-driver-2.4 to your kernel
+driver you just copy the linux directory inside ntfs-driver-2.4 to your kernel
 sources directory (see INSTALL file for detailed instructions on installing
 and using the driver).

--- configure DELETED ---

--- configure.in DELETED ---

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

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv7531/scripts

Removed Files:
	config.guess config.sub install-sh 
Log Message:
Remove the make process (slight flaw with module_init not being compiled for
some reason).


--- config.guess DELETED ---

--- config.sub DELETED ---

--- install-sh DELETED ---

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4/linux/fs/ntfs fs.c,1.4,1.5

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv22977/linux/fs/ntfs

Modified Files:
	fs.c 
Log Message:
Fixes but still no cigar.


Index: fs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/linux/fs/ntfs/fs.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- fs.c	2001/06/23 20:19:57	1.4
+++ fs.c	2001/06/23 21:10:40	1.5
@@ -1097,5 +1097,5 @@
 	console_verbose();
 #endif
-	printk(KERN_INFO "NTFS version " NTFS_VERSION "\n");
+	printk(KERN_NOTICE "NTFS version " NTFS_VERSION "\n");
 	SYSCTL(1);
 	ntfs_debug(DEBUG_OTHER, "registering %s\n", ntfs_fs_type.name);

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4 Makefile.module.in,1.2,1.3

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4
In directory usw-pr-cvs1:/tmp/cvs-serv22977

Modified Files:
	Makefile.module.in 
Log Message:
Fixes but still no cigar.


Index: Makefile.module.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/Makefile.module.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- Makefile.module.in	2001/06/23 09:14:12	1.2
+++ Makefile.module.in	2001/06/23 21:10:40	1.3
@@ -28,9 +28,6 @@
 LFLAGS	= -m elf_i386 -r
 
-CFLAGS += -g
-
 CFLAGS += -D__KERNEL__
 
-#CFLAGS += -DNTFS_IN_LINUX_KERNEL
 CFLAGS += -DNTFS_VERSION=\"010116\"
 
@@ -42,5 +39,5 @@
 CFLAGS += -pipe
 CFLAGS += -mpreferred-stack-boundary=2
-CFLAGS += -march=i686
+CFLAGS += -march=$(shell uname -m)
 
 CFLAGS += -I.
@@ -48,6 +45,6 @@
 
 CFLAGS += -DMODULE
-#CFLAGS += -DMODVERSIONS
-#CFLAGS += -include $(LINUX)/include/linux/modversions.h
+CFLAGS += -DMODVERSIONS
+CFLAGS += -include /usr/include/linux/modversions.h
 
 CFLAGS += -include $(INCLUDE)/linux/ntfs_fs.h

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4 Makefile.in,1.2,1.3

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4
In directory usw-pr-cvs1:/tmp/cvs-serv15519

Modified Files:
	Makefile.in 
Log Message:
Add install target.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- Makefile.in	2001/06/12 00:03:05	1.2
+++ Makefile.in	2001/06/23 20:19:57	1.3
@@ -3,4 +3,5 @@
 all:
 	make -f Makefile.module
+	strip ntfs.o
 
 clean:
@@ -23,3 +24,8 @@
 
 links:	$(LINKS)
+
+install: all
+	mkdir -p /lib/modules/$(shell uname -r)/kernel/fs/ntfs
+	cp `pwd`/ntfs.o /lib/modules/$(shell uname -r)/kernel/fs/ntfs/
+	depmod -a
 

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4/linux/fs/ntfs fs.c,1.3,1.4

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv15519/linux/fs/ntfs

Modified Files:
	fs.c 
Log Message:
Add install target.


Index: fs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/linux/fs/ntfs/fs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- fs.c	2001/06/22 14:48:41	1.3
+++ fs.c	2001/06/23 20:19:57	1.4
@@ -1097,5 +1097,5 @@
 	console_verbose();
 #endif
-	printk(KERN_NOTICE "NTFS version " NTFS_VERSION "\n");
+	printk(KERN_INFO "NTFS version " NTFS_VERSION "\n");
 	SYSCTL(1);
 	ntfs_debug(DEBUG_OTHER, "registering %s\n", ntfs_fs_type.name);

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4 Makefile.module.in,1.1,1.2

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

Changes by: flatcap

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4
In directory usw-pr-cvs1:/tmp/cvs-serv30735

Modified Files:
	Makefile.module.in 
Log Message:
try compiling ALL the files!


Index: Makefile.module.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/Makefile.module.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- Makefile.module.in	2001/06/12 00:03:05	1.1
+++ Makefile.module.in	2001/06/23 09:14:12	1.2
@@ -3,8 +3,9 @@
 SRCDIR	= linux/fs/ntfs
 
-SRC	= $(SRCDIR)/attr.c	 $(SRCDIR)/super.c	\
-	  $(SRCDIR)/dir.c	 $(SRCDIR)/support.c	\
-	  $(SRCDIR)/fs.c	 $(SRCDIR)/sysctl.c	\
-	  $(SRCDIR)/inode.c	 $(SRCDIR)/util.c
+SRC	= $(SRCDIR)/attr.c	 $(SRCDIR)/support.c	\
+	  $(SRCDIR)/dir.c	 $(SRCDIR)/sysctl.c	\
+	  $(SRCDIR)/fs.c	 $(SRCDIR)/unistr.c	\
+	  $(SRCDIR)/inode.c	 $(SRCDIR)/util.c	\
+	  $(SRCDIR)/super.c
 
 HDR	= $(SRCDIR)/attr.h	 $(SRCDIR)/struct.h 	\
@@ -15,8 +16,5 @@
 	  $(SRCDIR)/ntfstypes.h
 
-OBJ	= $(SRCDIR)/attr.o	 $(SRCDIR)/super.o	\
-	  $(SRCDIR)/dir.o	 $(SRCDIR)/support.o	\
-	  $(SRCDIR)/fs.o	 $(SRCDIR)/sysctl.o	\
-	  $(SRCDIR)/inode.o	 $(SRCDIR)/util.o
+OBJ	= $(SRC:.c=.o)
 
 OUT	= ntfs.o
@@ -32,5 +30,4 @@
 CFLAGS += -g
 
-#CFLAGS += -DHAVE_CONFIG_H
 CFLAGS += -D__KERNEL__
 
@@ -71,22 +68,4 @@
 .c.o:
 	$(CC) $(CFLAGS) -c $< -o $@
-
-#$(SRCDIR)/attr.c
-#$(SRCDIR)/attr.o
-#$(SRCDIR)/super.c
-#$(SRCDIR)/super.o
-#$(SRCDIR)/dir.c
-#$(SRCDIR)/dir.o
-#$(SRCDIR)/support.c
-#$(SRCDIR)/support.o
-#$(SRCDIR)/fs.c
-#$(SRCDIR)/fs.o
-#$(SRCDIR)/sysctl.c
-#$(SRCDIR)/sysctl.o
-#$(SRCDIR)/inode.c
-#$(SRCDIR)/inode.o
-#$(SRCDIR)/util.c
-#$(SRCDIR)/util.o
-
 
 clean:

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4 BUGS,1.1.1.1,1.2 ChangeLog,1.1,1.2

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4
In directory usw-pr-cvs1:/tmp/cvs-serv31542

Modified Files:
	BUGS ChangeLog 
Log Message:
commiting readme udpates


Index: BUGS
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/BUGS,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U2 -r1.1.1.1 -r1.2
--- BUGS	2001/06/11 17:22:02	1.1.1.1
+++ BUGS	2001/06/23 00:51:00	1.2
@@ -6,13 +6,7 @@
   dismounting a partition you wrote to.
 
-- Use "ls -l" instead of just "ls", otherwise the last entry in the directory
-  is not displayed for many directories.
-
 - Use the show_sys_files mount option which should make things work generally
   better. (It results in both the short and long file names being shown as well
   as the sytem files.)
-
-- Special characters are not treated correctly. For example if the file name
-  contains an apostrophe you will not be able to open it.
 
 - Writting of extension records is not supported properly.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- ChangeLog	2001/06/11 23:16:45	1.1
+++ ChangeLog	2001/06/23 00:51:00	1.2
@@ -1,4 +1,4 @@
 
-20/05/2001 - Changes between Linux kernel 2.4.4' NTFS and NTFS 1.1.14:
+20/05/2001 - Changes between Linux kernel 2.4.4' NTFS and NTFS 1.1.15:
 
 	- New mount option show_sys_files=<bool> to show all system files as

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4/linux/Documentation/filesystems ntfs.txt,1.2,1.3

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4/linux/Documentation/filesystems
In directory usw-pr-cvs1:/tmp/cvs-serv31542/linux/Documentation/filesystems

Modified Files:
	ntfs.txt 
Log Message:
commiting readme udpates


Index: ntfs.txt
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/linux/Documentation/filesystems/ntfs.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- ntfs.txt	2001/06/11 17:50:25	1.2
+++ ntfs.txt	2001/06/23 00:51:00	1.3
@@ -67,13 +67,7 @@
   dismounting a partition you wrote to.
 
-- Use "ls -l" instead of just "ls", otherwise the last entry in the directory
-  is not displayed for some directories. (?!?)
-
 - Use the show_sys_files mount option which should make things work generally
   better. (It results in both the short and long file names being shown as well
   as the sytem files.)
-
-- Special characters are not treated correctly. For example if the file name
-  contains an apostrophe you will not be able to open it.
 
 - Writing of extension records is not supported properly.

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4/linux/fs/ntfs inode.c,1.4,1.5

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

Changes by: flatcap

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv29849/linux/fs/ntfs

Modified Files:
	inode.c 
Log Message:
ahem.  revert to previous (correct) version


Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/linux/fs/ntfs/inode.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- inode.c	2001/06/22 14:48:41	1.4
+++ inode.c	2001/06/22 15:22:27	1.5
@@ -418,6 +418,4 @@
 
 	ntfs_debug(DEBUG_FILE1, "Initializing inode %x\n", inum);
-	if (!vol)
-		ntfs_error("NO VOLUME!\n");
 	ino->i_number = inum;
 	ino->vol = vol;

[Linux-NTFS-cvs] CVS: ntfs-driver-2.4/linux/fs/ntfs fs.c,1.2,1.3 inode.c,1.3,1.4

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

Changes by: flatcap

Update of /cvsroot/linux-ntfs/ntfs-driver-2.4/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv20639

Modified Files:
	fs.c inode.c 
Log Message:
a few changes suggested by the Stanford guys


Index: fs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/linux/fs/ntfs/fs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- fs.c	2001/06/11 17:50:25	1.2
+++ fs.c	2001/06/22 14:48:41	1.3
@@ -426,4 +426,5 @@
 
 static struct file_operations ntfs_file_operations_nommap = {
+	llseek:		generic_file_llseek,
 	read:		ntfs_read,
 #ifdef CONFIG_NTFS_RW
@@ -566,4 +567,5 @@
 
 static struct file_operations ntfs_file_operations = {
+	llseek:		generic_file_llseek,
 	read:		ntfs_read,
 	mmap:		generic_file_mmap,

Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/linux/fs/ntfs/inode.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- inode.c	2001/06/19 00:55:47	1.3
+++ inode.c	2001/06/22 14:48:41	1.4
@@ -418,4 +418,6 @@
 
 	ntfs_debug(DEBUG_FILE1, "Initializing inode %x\n", inum);
+	if (!vol)
+		ntfs_error("NO VOLUME!\n");
 	ino->i_number = inum;
 	ino->vol = vol;

[Linux-NTFS-cvs] CVS: dynamic-disk COPYING,1.1.1.1,1.2 ChangeLog,1.1,1.2

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

Changes by: flatcap

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

Modified Files:
	COPYING ChangeLog 
Log Message:
a few last minute fixes


Index: COPYING
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/COPYING,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U2 -r1.1.1.1 -r1.2
--- COPYING	2001/06/16 20:29:36	1.1.1.1
+++ COPYING	2001/06/21 23:38:14	1.2
@@ -2,9 +2,8 @@
  NOTE: The GPL below is copyrighted by the Free Software Foundation, 
  but the instances of code that it refers to (the Linux-NTFS project,
- including the NTFS library "libntfs", the NTFS utilities "ntfstools"
- and the Linux kernel NTFS driver) are copyrighted by me and others
- who actually wrote them.
+ including the Linux-LDM tool and kernel driver) are copyrighted by
+ me and others who actually wrote them.
 
-	Anton Altaparmakov <ai...@ca...>
+	Richard Russon <nt...@fl...>
 
 --------------------------------------------------------------------

Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- ChangeLog	2001/06/21 02:11:37	1.1
+++ ChangeLog	2001/06/21 23:38:14	1.2
@@ -1,3 +1,3 @@
-2000-06-21	Richard Russon <nt...@fl...>
+2000-06-22	Richard Russon <nt...@fl...>
 
 	* Version 0.0.1	released

[Linux-NTFS-cvs] CVS: dynamic-disk/linux/fs/partitions msdos.c,1.1.1.1,NONE msdos.h,1.1.1.1,NONE

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

Changes by: flatcap

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

Removed Files:
	msdos.c msdos.h 
Log Message:
a few fixes to the build, we didn't need msdos.[ch]


--- msdos.c DELETED ---

--- msdos.h DELETED ---

[Linux-NTFS-cvs] CVS: dynamic-disk/test Makefile.in,1.4,1.5 drive.c,1.5,1.6

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

Changes by: flatcap

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

Modified Files:
	Makefile.in drive.c 
Log Message:
a few fixes to the build, we didn't need msdos.[ch]


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- Makefile.in	2001/06/20 03:38:10	1.4
+++ Makefile.in	2001/06/21 23:15:02	1.5
@@ -23,5 +23,5 @@
 CFLAGS += -pipe
 CFLAGS += -mpreferred-stack-boundary=2
-CFLAGS += -march=i686
+CFLAGS += -march=i386
 CFLAGS += -D_FILE_OFFSET_BITS=64
 

Index: drive.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/drive.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- drive.c	2001/06/20 03:38:10	1.5
+++ drive.c	2001/06/21 23:15:02	1.6
@@ -34,5 +34,5 @@
 
 #include "../linux/fs/partitions/check.h"
-#include "../linux/fs/partitions/msdos.h"
+//#include "../linux/fs/partitions/msdos.h"
 
 int	exit  (int);
@@ -54,4 +54,18 @@
 
 int device;
+
+/*----------------------------------------------------------------------------*/
+/* We're not bothered about these */
+int acorn_partition (struct gendisk *a, kdev_t b, unsigned long c, int d) { return 0; }
+int msdos_partition (struct gendisk *a, kdev_t b, unsigned long c, int d) { return 0; }
+int osf_partition   (struct gendisk *a, kdev_t b, unsigned long c, int d) { return 0; }
+int sun_partition   (struct gendisk *a, kdev_t b, unsigned long c, int d) { return 0; }
+int amiga_partition (struct gendisk *a, kdev_t b, unsigned long c, int d) { return 0; }
+int atari_partition (struct gendisk *a, kdev_t b, unsigned long c, int d) { return 0; }
+int mac_partition   (struct gendisk *a, kdev_t b, unsigned long c, int d) { return 0; }
+int sgi_partition   (struct gendisk *a, kdev_t b, unsigned long c, int d) { return 0; }
+int ultrix_partition(struct gendisk *a, kdev_t b, unsigned long c, int d) { return 0; }
+int ibm_partition   (struct gendisk *a, kdev_t b, unsigned long c, int d) { return 0; }
+/*----------------------------------------------------------------------------*/
 
 int printk(const char *fmt, ...)

[Linux-NTFS-cvs] CVS: dynamic-disk Makefile.driver.in,1.3,1.4 README,1.2,1.3 configure,1.1.1.1,1.2 configure.in,1.1.1.1,1.2

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

Changes by: flatcap

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

Modified Files:
	Makefile.driver.in README configure configure.in 
Log Message:
a few fixes to the build, we didn't need msdos.[ch]


Index: Makefile.driver.in
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/Makefile.driver.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- Makefile.driver.in	2001/06/20 03:38:09	1.3
+++ Makefile.driver.in	2001/06/21 23:15:02	1.4
@@ -3,5 +3,5 @@
 SRCDIR	= linux/fs/partitions
 
-SRC	= $(SRCDIR)/check.c $(SRCDIR)/msdos.c $(SRCDIR)/ldm.c
+SRC	= $(SRCDIR)/check.c $(SRCDIR)/ldm.c
 HDR	= $(SRC:.c=.h)
 OBJ	= $(SRC:.c=.o)
@@ -29,5 +29,5 @@
 CFLAGS += -pipe
 CFLAGS += -mpreferred-stack-boundary=2
-CFLAGS += -march=i686
+CFLAGS += -march=i386
 
 CFLAGS += -I.

Index: README
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- README	2001/06/21 02:11:37	1.2
+++ README	2001/06/21 23:15:02	1.3
@@ -16,10 +16,6 @@
 should do the trick.  If it doesn't build without errors,
 then you'll need to know your way around the kernel to
-fix things.  One problem is the inclusion of autoconf.h
-If you built other partition types into your last kernel
-then they'll probably show up a missing entries at link
-time.
+fix things.
 
-
 To run the tool, just point it at a disk, e.g. /dev/hda
 
@@ -29,14 +25,14 @@
 
 Partition check:
- hdb: hdb1 < hdb5 hdb6 hdb7 hdb8 >
+ hda: hda1 < hda5 hda6 hda7 hda8 >
 
  Device | Offset Bytes    Sectors     Mb | Size   Bytes    Sectors     Mb
  -------+--------------------------------+-------------------------------
- hdb    |            0          0      0 |     21159936      41328     20
- hdb1   |     20111360      39280     19 |      1048576       2048      1
- hdb5   |        32256         63      0 |      5242880      10240      5
- hdb6   |      5275136      10303      5 |      5242880      10240      5
- hdb7   |     10518016      20543     10 |      3145728       6144      3
- hdb8   |     13663744      26687     13 |      6291456      12288      6
+ hda    |            0          0      0 |     21159936      41328     20
+ hda1   |     20111360      39280     19 |      1048576       2048      1
+ hda5   |        32256         63      0 |      5242880      10240      5
+ hda6   |      5275136      10303      5 |      5242880      10240      5
+ hda7   |     10518016      20543     10 |      3145728       6144      3
+ hda8   |     13663744      26687     13 |      6291456      12288      6
 
 

Index: configure
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/configure,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U2 -r1.1.1.1 -r1.2
--- configure	2001/06/16 20:29:36	1.1.1.1
+++ configure	2001/06/21 23:15:02	1.2
@@ -452,5 +452,5 @@
 # A filename unique to this package, relative to the directory that
 # configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=linux/fs/partitions/msdos.c
+ac_unique_file=linux/fs/partitions/ldm.c
 
 # Find the source files, if location was not specified.

Index: configure.in
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/configure.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U2 -r1.1.1.1 -r1.2
--- configure.in	2001/06/16 20:29:36	1.1.1.1
+++ configure.in	2001/06/21 23:15:02	1.2
@@ -1,4 +1,4 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(linux/fs/partitions/msdos.c)
+AC_INIT(linux/fs/partitions/ldm.c)
 
 dnl Checks for programs.

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

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

Changes by: flatcap

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

Modified Files:
	ldm.c 
Log Message:
a few minor tweaks before the first release


Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- ldm.c	2001/06/21 01:08:45	1.6
+++ ldm.c	2001/06/21 02:11:37	1.7
@@ -72,5 +72,5 @@
 /* We're looking for an MSDOS-style partition table with one entry in it:
  * 0x42, which works like an extended partition.  Detail will be placed in pt.*/
-int parse_part_table (u8 *buffer, struct ldmpart *pt)
+static int parse_part_table (u8 *buffer, struct ldmpart *pt)
 {
 	struct partition *p;
@@ -92,5 +92,5 @@
 }
 
-int parse_privhead (u8 *buffer, struct privhead *ph)
+static int parse_privhead (u8 *buffer, struct privhead *ph)
 {
 	if (!buffer || !ph)
@@ -118,5 +118,5 @@
 }
 
-int parse_tocblock (u8 *buffer, struct tocblock *toc)
+static int parse_tocblock (u8 *buffer, struct tocblock *toc)
 {
 	if (!buffer || !toc)
@@ -127,5 +127,5 @@
 }
 
-int parse_vmdb (u8 *buffer, struct vmdb *vm)
+static int parse_vmdb (u8 *buffer, struct vmdb *vm)
 {
 	if (!buffer || !vm)
@@ -146,5 +146,5 @@
 }
 
-int parse_partition (u8 *buffer, struct vblk *vb)
+static int parse_partition (u8 *buffer, struct vblk *vb)
 {
 	int rel_objid;
@@ -169,5 +169,5 @@
 }
 
-int parse_vblk (struct privhead *ph, u8 *buffer, struct vblk *vb)
+static int parse_vblk (struct privhead *ph, u8 *buffer, struct vblk *vb)
 {
 	if (!buffer || !vb)
@@ -197,5 +197,5 @@
 /* validate the range, then put an entry into the kernel's partition table
  * start and size are numbers of sectors */
-int create_partition (struct gendisk *hd, int minor, int start, int size)
+static int create_partition (struct gendisk *hd, int minor, int start, int size)
 {
 	int disk_minor;
@@ -213,5 +213,5 @@
 /* find the primary private header, locate the LDM database,
  * then create a partition to wrap it */
-int create_db_partition (struct gendisk *hd, kdev_t dev, struct privhead *ph)
+static int create_db_partition (struct gendisk *hd, kdev_t dev, struct privhead *ph)
 {
 	struct buffer_head *bh;
@@ -239,5 +239,5 @@
 /* We already have one privhead from the beginning of the disk.
  * Now we compare the two other copies for safety. */
-int validate_privheads (kdev_t dev, struct privhead *ph)
+static int validate_privheads (kdev_t dev, struct privhead *ph)
 {
 	struct buffer_head *bh;
@@ -267,5 +267,5 @@
 
 /* Find and compare the four Tables Of Contents */
-int validate_tocblocks (kdev_t devdb, struct tocblock *toc1)
+static int validate_tocblocks (kdev_t devdb, struct tocblock *toc1)
 {
 	struct buffer_head *bh;