[Linux-NTFS-cvs] CVS: linux-ntfs/libntfs disk_io.c,1.7,1.8 bitmap.c,1.1,1.2

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

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv2134

Modified Files:
	disk_io.c bitmap.c 
Log Message:
See last commit message.


Index: disk_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/disk_io.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- disk_io.c	2001/04/02 02:04:37	1.7
+++ disk_io.c	2001/04/03 22:42:42	1.8
@@ -290,5 +290,5 @@
 	if (vol->number_of_mft_records < m + count)
 		return -ESPIPE;
-	if (!get_bit(vol->mft_bitmap, m))
+	if (!ntfs_get_bit(vol->mft_bitmap, m))
 		return -ENOENT;
 	/* Size of mft record != size of cluster thus need to work with
@@ -424,5 +424,5 @@
 	if (vol->number_of_mft_records <= m)
 		return -ESPIPE;
-	if (!get_bit(vol->mft_bitmap, m))
+	if (!ntfs_get_bit(vol->mft_bitmap, m))
 		return -ENOENT;
 	/* Size of mft record != size of cluster thus need to work with offsets

Index: bitmap.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/bitmap.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- bitmap.c	2001/01/25 22:25:43	1.1
+++ bitmap.c	2001/04/03 22:42:42	1.2
@@ -32,5 +32,5 @@
  */
 
-inline void set_bit(__u8 *bitmap, const __u64 bit, const __u8 new_value)
+inline void ntfs_set_bit(__u8 *bitmap, const __u64 bit, const __u8 new_value)
 {
 	if (!bitmap || new_value > 1)
@@ -42,5 +42,5 @@
 }
 
-inline char get_bit(const __u8 *bitmap, const __u64 bit)
+inline char ntfs_get_bit(const __u8 *bitmap, const __u64 bit)
 {
 	if (!bitmap)
@@ -49,5 +49,5 @@
 }
 
-inline char get_and_set_bit(__u8 *bitmap, const __u64 bit,
+inline char ntfs_get_and_set_bit(__u8 *bitmap, const __u64 bit,
 			    const __u8 new_value)
 {