You can subscribe to this list here.
| 2001 |
Jan
(38) |
Feb
(25) |
Mar
(37) |
Apr
(50) |
May
|
Jun
(156) |
Jul
(174) |
Aug
(94) |
Sep
(107) |
Oct
(18) |
Nov
(153) |
Dec
(91) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(79) |
Feb
(117) |
Mar
(39) |
Apr
(164) |
May
(12) |
Jun
(64) |
Jul
(138) |
Aug
(43) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(17) |
Jun
(100) |
Jul
(210) |
Aug
(127) |
Sep
(89) |
Oct
(214) |
Nov
(176) |
Dec
(20) |
| 2006 |
Jan
(29) |
Feb
(85) |
Mar
(45) |
Apr
(54) |
May
(9) |
Jun
(7) |
Jul
(28) |
Aug
(65) |
Sep
(3) |
Oct
(62) |
Nov
(68) |
Dec
(52) |
| 2007 |
Jan
(6) |
Feb
|
Mar
(8) |
Apr
|
May
|
Jun
(2) |
Jul
(4) |
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
|
From: Richard R. <fl...@us...> - 2002-06-23 16:38:29
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/dynamic-disk/patch
In directory usw-pr-cvs1:/tmp/cvs-serv8357/patch
Added Files:
linux-2.4.18-ldm linux-2.4.19-pre10-ldm linux-2.5.23-ldm
linux-2.5.24-ldm readme remove-non-kernel
Log Message:
patches for current kernels
updates to configuration & docs
--- NEW FILE ---
diff -urN linux-2.4.18/Documentation/Configure.help linux-2.4.18-ldm/Documentation/Configure.help
--- linux-2.4.18/Documentation/Configure.help Mon May 27 23:07:29 2002
+++ linux-2.4.18-ldm/Documentation/Configure.help Sun Jun 23 16:42:51 2002
@@ -14876,7 +14876,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.
@@ -14884,15 +14884,14 @@
Windows 2000 introduced the concept of Dynamic Disks to get around
the limitations of the PC's partitioning scheme. The Logical Disk
- Manager allows the user to repartion a disk and create spanned,
+ Manager allows the user to repartition a disk and create spanned,
mirrored, striped or RAID volumes, all without the need for
[...2513 lines suppressed...]
+
+cleanup:
+ 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);
out:
- kfree(ph);
- kfree(toc);
- kfree(vm);
- kfree(dk);
+ kfree (ldb);
return err;
-no_mem:
- printk(LDM_CRIT "Not enough memory to allocate required buffers.\n");
- err = -1;
- goto out;
}
-
--- NEW FILE ---
diff -urN linux-2.4.19-pre10/Documentation/Configure.help linux-2.4.19-pre10-ldm/Documentation/Configure.help
--- linux-2.4.19-pre10/Documentation/Configure.help Fri Jun 21 16:03:57 2002
+++ linux-2.4.19-pre10-ldm/Documentation/Configure.help Fri Jun 21 16:05:55 2002
@@ -15233,7 +15233,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.
@@ -15241,15 +15241,14 @@
Windows 2000 introduced the concept of Dynamic Disks to get around
the limitations of the PC's partitioning scheme. The Logical Disk
- Manager allows the user to repartion a disk and create spanned,
+ Manager allows the user to repartition a disk and create spanned,
mirrored, striped or RAID volumes, all without the need for
[...2513 lines suppressed...]
+
+cleanup:
+ 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);
out:
- kfree(ph);
- kfree(toc);
- kfree(vm);
- kfree(dk);
+ kfree (ldb);
return err;
-no_mem:
- printk(LDM_CRIT "Not enough memory to allocate required buffers.\n");
- err = -1;
- goto out;
}
-
--- NEW FILE ---
diff -urN linux-2.5.23/Documentation/ldm.txt linux-2.5.23-ldm/Documentation/ldm.txt
--- linux-2.5.23/Documentation/ldm.txt Thu Jan 1 01:00:00 1970
+++ linux-2.5.23-ldm/Documentation/ldm.txt Fri Jun 21 12:49:17 2002
@@ -0,0 +1,102 @@
+
+ LDM - Logical Disk Manager (Dynamic Disks)
+ ------------------------------------------
+
+Overview
+--------
+
+Windows 2000 and XP use a new partitioning scheme. It is a complete
+replacement for the MSDOS style partitions. It stores its information in a
+1MiB journalled database at the end of the physical disk. The size of
+partitions is limited only by disk space. The maximum number of partitions is
+nearly 2000.
+
+Any partitions created under the LDM are called "Dynamic Disks". There are no
+longer any primary or extended partitions. Normal MSDOS style partitions are
[...2799 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.5.24/Documentation/ldm.txt linux-2.5.24-ldm/Documentation/ldm.txt
--- linux-2.5.24/Documentation/ldm.txt Thu Jan 1 01:00:00 1970
+++ linux-2.5.24-ldm/Documentation/ldm.txt Fri Jun 21 12:49:17 2002
@@ -0,0 +1,102 @@
+
+ LDM - Logical Disk Manager (Dynamic Disks)
+ ------------------------------------------
+
+Overview
+--------
+
+Windows 2000 and XP use a new partitioning scheme. It is a complete
+replacement for the MSDOS style partitions. It stores its information in a
+1MiB journalled database at the end of the physical disk. The size of
+partitions is limited only by disk space. The maximum number of partitions is
+nearly 2000.
+
+Any partitions created under the LDM are called "Dynamic Disks". There are no
+longer any primary or extended partitions. Normal MSDOS style partitions are
[...2799 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 ---
If you want to add the latest LDM driver to the kernel you can use the patches
in this directory.
Patch For Kernel
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
--- NEW FILE ---
--- src/ldm.c Fri Jun 21 15:37:16 2002
+++ kernel/ldm.c Sun Jun 23 17:12:45 2002
@@ -32,19 +32,6 @@
#include "check.h"
#include "msdos.h"
-#ifdef CONFIG_LDM_EXPORT_SYMBOLS
-# define static
-#endif
-
-#ifdef CONFIG_BLK_DEV_MD
-extern void md_autodetect_dev (kdev_t dev);
-#endif
-
-#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);
-#endif
-
typedef enum {
FALSE = 0,
TRUE = 1
@@ -603,32 +590,6 @@
}
/**
- * ldm_find_vblk - Search a linked list of VBLKs for a given object id
- * @lh_vl: Head of a linked list of VBLKs
- * @id: Object id to find
- *
- * Return: Pointer, A matching vblk was found
- * NULL, No match, or an error
- */
-#ifdef CONFIG_BLK_DEV_MD
-static struct vblk * ldm_find_vblk (const struct list_head *lh_vl, u64 id)
-{
- struct list_head *item;
-
- BUG_ON (!lh_vl);
-
- list_for_each (item, lh_vl) {
- struct vblk *vb = list_entry (item, struct vblk, list);
- if (vb->obj_id == id)
- return vb;
- }
-
- ldm_debug ("Search for vblk #%llu failed!", (unsigned long long) id);
- return NULL;
-}
-#endif
-
-/**
* ldm_get_disk_objid - Search a linked list of vblk's for a given Disk Id
* @ldb: ldmdb struct
*
@@ -732,10 +693,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);
-#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++;
-#ifdef CONFIG_BLK_DEV_MD
- /* Try to get parent component */
- c = ldm_find_vblk (&ldb->v_comp, part->parent_id);
- if (!c) {
- ldm_error ("Can't find VBLK's parent (component).");
- continue;
- }
-
- /* Try to get parent volume */
- v = ldm_find_vblk (&ldb->v_volu, c->vblk.comp.parent_id);
- if (v == NULL) {
- ldm_error ("Can't find VBLK's parent (volume).");
- continue;
- }
-
- /* Notify md of RAID autodetect part types */
- if (v->vblk.volu.partition_type == LINUX_RAID_PARTITION) {
- md_autodetect_dev (dev);
- continue;
- }
- /* Register to LDM_MD */
-#ifdef CONFIG_LDM_MD
- ldm_md_addpart (v->vblk.volu.guid, c->obj_id,
- c->vblk.comp.type, part->partnum, c->vblk.comp.children,
- c->vblk.comp.chunksize / (4096 / 512), dev);
-#endif
-#endif
}
printk ("\n");
|
|
From: Richard R. <fl...@us...> - 2002-06-23 16:38:29
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/dynamic-disk/linux/Documentation
In directory usw-pr-cvs1:/tmp/cvs-serv8357/linux/Documentation
Added Files:
Config.help Config.in ldm.txt
Log Message:
patches for current kernels
updates to configuration & docs
--- NEW FILE ---
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.
They are also known as "Dynamic Disks".
Windows 2000 introduced the concept of Dynamic Disks to get around
the limitations of the PC's partitioning scheme. The Logical Disk
Manager allows the user to repartition a disk and create spanned,
mirrored, striped or RAID volumes, all without the need for
rebooting.
Normal partitions are now called Basic Disks under Windows 2000 and
XP.
For a fuller description read <file:Documentation/ldm.txt>.
If unsure, say N.
CONFIG_LDM_DEBUG
Say Y here if you would like LDM to log verbosely. This could be
helpful if the driver doesn't work as expected and you'd like to
report a bug.
If unsure, say N.
--- NEW FILE ---
dep_bool ' Windows Logical Disk Manager (Dynamic Disk) support' CONFIG_LDM_PARTITION
if [ "$CONFIG_LDM_PARTITION" = "y" ]; then
bool ' Windows LDM extra logging' CONFIG_LDM_DEBUG
fi
--- NEW FILE ---
LDM - Logical Disk Manager (Dynamic Disks)
------------------------------------------
Overview
--------
Windows 2000 and XP use a new partitioning scheme. It is a complete
replacement for the MSDOS style partitions. It stores its information in a
1MiB journalled database at the end of the physical disk. The size of
partitions is limited only by disk space. The maximum number of partitions is
nearly 2000.
Any partitions created under the LDM are called "Dynamic Disks". There are no
longer any primary or extended partitions. Normal MSDOS style partitions are
now known as Basic Disks.
If you wish to use Spanned, Striped, Mirrored or RAID 5 Volumes, you must use
Dynamic Disks. The journalling allows Windows to make changes to these
partitions and filesystems without the need to reboot.
Once the LDM driver has divided up the disk, you can use the MD driver to
assemble any multi-partition volumes, e.g. Stripes, RAID5.
To prevent legacy applications from repartitioning the disk, the LDM creates a
dummy MSDOS partition containing one disk-sized partition.
Example
-------
Below we have a 50MiB disk, divided into seven partitions.
N.B. The missing 1MiB at the end of the disk is where the LDM database is
stored.
Device | Offset Bytes Sectors MiB | Size Bytes Sectors MiB
-------+----------------------------+---------------------------
hda | 0 0 0 | 52428800 102400 50
hda1 | 51380224 100352 49 | 1048576 2048 1
hda2 | 16384 32 0 | 6979584 13632 6
hda3 | 6995968 13664 6 | 10485760 20480 10
hda4 | 17481728 34144 16 | 4194304 8192 4
hda5 | 21676032 42336 20 | 5242880 10240 5
hda6 | 26918912 52576 25 | 10485760 20480 10
hda7 | 37404672 73056 35 | 13959168 27264 13
The LDM Database may not store the partitions in the order that they appear on
disk, but the driver will sort them.
When Linux boots, you will see something like:
hda: 102400 sectors w/32KiB Cache, CHS=50/64/32
hda: [LDM] hda1 hda2 hda3 hda4 hda5 hda6 hda7
Compiling LDM Support
---------------------
To enable LDM, choose the following two options:
"Advanced partition selection" CONFIG_PARTITION_ADVANCED
"Windows Logical Disk Manager (Dynamic Disk) support" CONFIG_LDM_PARTITION
If you believe the driver isn't working as it should, you can enable the extra
debugging code. This will produce a LOT of output. The option is:
"Windows LDM extra logging" CONFIG_LDM_DEBUG
N.B. The partition code cannot be compiled as a module.
As with all the partition code, if the driver doesn't see signs of its type of
partition, it will pass control to another driver, so there is no harm in
enabling it.
If you have Dynamic Disks but don't enable the driver, then all you will see
is a dummy MSDOS partition filling the whole disk. You won't be able to mount
any of the volumes on the disk.
Booting
-------
If you enable LDM support, then lilo is capable of booting from any of the
discovered partitions. However, grub does not understand the LDM partitioning
and cannot boot from a Dynamic Disk.
More Documentation
------------------
There is an Overview of the LDM online together with complete Technical
Documentation. It can also be downloaded in html.
http://linux-ntfs.sourceforge.net/ldm/index.html
http://linux-ntfs.sourceforge.net/downloads.html
If you have any LDM questions that aren't answered on the website, email me.
Cheers,
FlatCap - Richard Russon
ld...@fl...
|
|
From: Richard R. <fl...@us...> - 2002-06-23 16:18:20
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/dynamic-disk/patch In directory usw-pr-cvs1:/tmp/cvs-serv4105/patch Log Message: Directory /cvsroot/linux-ntfs/dynamic-disk/patch added to the repository |
|
From: Richard R. <fl...@us...> - 2002-06-21 14:31:48
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/dynamic-disk In directory usw-pr-cvs1:/tmp/cvs-serv29692 Modified Files: AUTHORS Log Message: reverted DEBUG_ON->BUG_ON simplified logging minor cleanups Index: AUTHORS =================================================================== RCS file: /cvsroot/linux-ntfs/dynamic-disk/AUTHORS,v retrieving revision 1.3 retrieving revision 1.4 diff -U2 -r1.3 -r1.4 --- AUTHORS 27 Nov 2001 10:11:39 -0000 1.3 +++ AUTHORS 21 Jun 2002 14:31:44 -0000 1.4 @@ -1,5 +1,5 @@ Linux kernel driver for LDM written by "Richard Russon" <ld...@fl...> - "Anton Altaparmakov" <an...@us...> + "Anton Altaparmakov" <ai...@ca...> "Jakob Kemi" <jak...@te...> |
|
From: Richard R. <fl...@us...> - 2002-06-21 14:31:48
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv29692/linux/fs/partitions
Modified Files:
ldm.c ldm.h
Log Message:
reverted DEBUG_ON->BUG_ON
simplified logging
minor cleanups
Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -U2 -r1.78 -r1.79
--- ldm.c 20 Jun 2002 18:04:51 -0000 1.78
+++ ldm.c 21 Jun 2002 14:31:44 -0000 1.79
@@ -27,4 +27,5 @@
#include <linux/slab.h>
#include <linux/pagemap.h>
+#include <linux/buffer_head.h>
#include <linux/stringify.h>
#include "ldm.h"
@@ -51,5 +52,5 @@
/**
- * ldm_debug - Output an error message if debugging was enabled at compile time
+ * ldm_debug/info/error/crit - Output an error message
* @f: A printf format string containing the message
* @...: The variables to substitute into @f
@@ -59,34 +60,19 @@
*/
#ifndef CONFIG_LDM_DEBUG
-# define ldm_debug(...) do {} while (0)
-# define DEBUG_ON(x) do {} while (0)
+#define ldm_debug(...) do {} while (0)
#else
-# define DEBUG_ON BUG_ON
-# define ldm_debug(f, a...) \
- _ldm_printf (LDM_DEBUG, __LINE__, __func__, f, ##a)
+#define ldm_debug(f, a...) _ldm_printk (KERN_DEBUG, __FUNCTION__, f, ##a)
#endif
-#define ldm_crit(f, a...) _ldm_printf (LDM_CRIT, __LINE__, __func__, f, ##a)
-#define ldm_error(f, a...) _ldm_printf (LDM_ERR, __LINE__, __func__, f, ##a)
-#define ldm_info(f, a...) _ldm_printf (LDM_INFO, __LINE__, __func__, f, ##a)
-
-__attribute__ ((format (printf, 4, 5)))
-static void _ldm_printf (unsigned level, int line,
- const char *function, const char *fmt, ...)
+#define ldm_crit(f, a...) _ldm_printk (KERN_CRIT, __FUNCTION__, f, ##a)
+#define ldm_error(f, a...) _ldm_printk (KERN_ERR, __FUNCTION__, f, ##a)
+#define ldm_info(f, a...) _ldm_printk (KERN_INFO, __FUNCTION__, f, ##a)
+
+__attribute__ ((format (printf, 3, 4)))
+static void _ldm_printk (const char *level, const char *function,
+ const char *fmt, ...)
{
static char buf[128];
va_list args;
- static const char *const prefix[] = {
- KERN_CRIT "(CRITICAL)",
- KERN_ERR "(ERROR)",
- KERN_INFO "(INFO)",
- KERN_DEBUG "(DEBUG)"};
-
- const char* file =
-#ifdef KBUILD_BASENAME
- __stringify (KBUILD_BASENAME);
-#else
- "ldm.c"; // FIXME: __FILE__ is too verbose.
-#endif
va_start (args, fmt);
@@ -94,8 +80,8 @@
va_end (args);
- printk ("%s (%s, %d) %s(): %s\n", prefix[level], file, line, function,
- buf);
+ printk ("%s%s(): %s\n", level, function, buf);
}
+
/**
* ldm_parse_hexbyte - Convert a ASCII hex number to a byte
@@ -167,5 +153,5 @@
static BOOL ldm_parse_privhead (const u8 *data, struct privhead *ph)
{
- DEBUG_ON (!data || !ph);
+ BUG_ON (!data || !ph);
if (MAGIC_PRIVHEAD != BE64 (data)) {
@@ -224,5 +210,5 @@
static BOOL ldm_parse_tocblock (const u8 *data, struct tocblock *toc)
{
- DEBUG_ON (!data || !toc);
+ BUG_ON (!data || !toc);
if (MAGIC_TOCBLOCK != BE64 (data)) {
@@ -270,5 +256,5 @@
static BOOL ldm_parse_vmdb (const u8 *data, struct vmdb *vm)
{
- DEBUG_ON (!data || !vm);
+ BUG_ON (!data || !vm);
if (MAGIC_VMDB != BE32 (data)) {
@@ -306,5 +292,5 @@
const struct privhead *ph2)
{
- DEBUG_ON (!ph1 || !ph2);
+ BUG_ON (!ph1 || !ph2);
return ((ph1->ver_major == ph2->ver_major) &&
@@ -330,5 +316,5 @@
const struct tocblock *toc2)
{
- DEBUG_ON (!toc1 || !toc2);
+ BUG_ON (!toc1 || !toc2);
return ((toc1->bitmap1_start == toc2->bitmap1_start) &&
@@ -371,5 +357,5 @@
int i;
- DEBUG_ON (!bdev || !ph1);
+ BUG_ON (!bdev || !ph1);
ph[1] = kmalloc (sizeof (*ph[1]), GFP_KERNEL);
@@ -398,5 +384,5 @@
goto out; /* Already logged */
else
- break; // FIXME ignore for now, 3rd PH can fail on odd-sized disks
+ break; /* FIXME ignore for now, 3rd PH can fail on odd-sized disks */
}
}
@@ -412,5 +398,6 @@
if ((ph[0]->logical_disk_start > ph[0]->config_start) ||
- ((ph[0]->logical_disk_start + ph[0]->logical_disk_size) > ph[0]->config_start)) {
+ ((ph[0]->logical_disk_start + ph[0]->logical_disk_size)
+ > ph[0]->config_start)) {
ldm_crit ("Disk and database overlap.");
goto out;
@@ -421,9 +408,10 @@
goto out;
}
+ /* FIXME ignore this for now
if (!ldm_compare_privheads (ph[0], ph[2])) {
- //ldm_crit ("Primary and backup PRIVHEADs don't match.");
- //goto out; // FIXME ignore this for now
+ ldm_crit ("Primary and backup PRIVHEADs don't match.");
+ goto out;
}
-
+ */
ldm_debug ("Validated PRIVHEADs successfully.");
result = TRUE;
@@ -459,5 +447,5 @@
int i;
- DEBUG_ON (!bdev || !ldb);
+ BUG_ON (!bdev || !ldb);
ph = &ldb->ph;
@@ -528,5 +516,5 @@
struct tocblock *toc;
- DEBUG_ON (!bdev || !ldb);
+ BUG_ON (!bdev || !ldb);
vm = &ldb->vm;
@@ -586,5 +574,5 @@
BOOL result = FALSE;
- DEBUG_ON (!bdev);
+ BUG_ON (!bdev);
data = read_dev_sector (bdev, 0, §);
@@ -628,5 +616,5 @@
struct list_head *item;
- DEBUG_ON (!lh_vl);
+ BUG_ON (!lh_vl);
list_for_each (item, lh_vl) {
@@ -656,5 +644,5 @@
struct list_head *item;
- DEBUG_ON (!ldb);
+ BUG_ON (!ldb);
list_for_each (item, &ldb->v_disk) {
@@ -681,9 +669,9 @@
*/
static BOOL ldm_create_partition (struct gendisk *hd, int minor, int start,
- int size)
+ int size)
{
int disk_minor;
- DEBUG_ON (!hd || !hd->part);
+ BUG_ON (!hd || !hd->part);
/* Get the minor number of the parent device
@@ -728,5 +716,5 @@
int minor;
- DEBUG_ON (!hd || !ldb);
+ BUG_ON (!hd || !ldb);
disk = ldm_get_disk_objid (ldb);
@@ -840,5 +828,5 @@
u8 length;
- DEBUG_ON (!block);
+ BUG_ON (!block);
length = *block++;
@@ -874,5 +862,5 @@
int length;
- DEBUG_ON (!block || !buffer);
+ BUG_ON (!block || !buffer);
length = block[0];
@@ -904,5 +892,5 @@
struct vblk_comp *comp;
- DEBUG_ON (!buffer || !vb);
+ BUG_ON (!buffer || !vb);
r_objid = ldm_relative (buffer, buflen, 0x18, 0);
@@ -955,5 +943,5 @@
struct vblk_dgrp *dgrp;
- DEBUG_ON (!buffer || !vb);
+ BUG_ON (!buffer || !vb);
r_objid = ldm_relative (buffer, buflen, 0x18, 0);
@@ -1000,5 +988,5 @@
struct vblk_dgrp *dgrp;
- DEBUG_ON (!buffer || !vb);
+ BUG_ON (!buffer || !vb);
r_objid = ldm_relative (buffer, buflen, 0x18, 0);
@@ -1043,5 +1031,5 @@
struct vblk_disk *disk;
- DEBUG_ON (!buffer || !vb);
+ BUG_ON (!buffer || !vb);
r_objid = ldm_relative (buffer, buflen, 0x18, 0);
@@ -1082,5 +1070,5 @@
struct vblk_disk *disk;
- DEBUG_ON (!buffer || !vb);
+ BUG_ON (!buffer || !vb);
r_objid = ldm_relative (buffer, buflen, 0x18, 0);
@@ -1115,5 +1103,5 @@
struct vblk_part *part;
- DEBUG_ON (!buffer || !vb);
+ BUG_ON (!buffer || !vb);
r_objid = ldm_relative (buffer, buflen, 0x18, 0);
@@ -1168,5 +1156,5 @@
struct vblk_volu *volu;
- DEBUG_ON (!buffer || !vb);
+ BUG_ON (!buffer || !vb);
r_objid = ldm_relative (buffer, buflen, 0x18, 0);
@@ -1238,5 +1226,5 @@
int r_objid;
- DEBUG_ON (!buf || !vb);
+ BUG_ON (!buf || !vb);
r_objid = ldm_relative (buf, len, 0x18, 0);
@@ -1266,5 +1254,5 @@
else
ldm_error ("Failed to parse VBLK 0x%llx (type: 0x%02x).",
- vb->obj_id, vb->type);
+ (unsigned long long) vb->obj_id, vb->type);
return result;
@@ -1290,5 +1278,5 @@
struct list_head *item;
- DEBUG_ON (!data || !ldb);
+ BUG_ON (!data || !ldb);
vb = kmalloc (sizeof (*vb), GFP_KERNEL);
@@ -1352,5 +1340,5 @@
int rec, num, group;
- DEBUG_ON (!data || !frags);
+ BUG_ON (!data || !frags);
group = BE32 (data + 0x08);
@@ -1410,5 +1398,5 @@
struct list_head *item, *tmp;
- DEBUG_ON (!list);
+ BUG_ON (!list);
list_for_each_safe (item, tmp, list)
@@ -1433,5 +1421,5 @@
BOOL result = FALSE;
- DEBUG_ON (!frags || !ldb);
+ BUG_ON (!frags || !ldb);
list_for_each (item, frags) {
@@ -1464,5 +1452,6 @@
* FALSE An error occurred
*/
-static BOOL ldm_get_vblks (struct block_device *bdev, unsigned long base, struct ldmdb *ldb)
+static BOOL ldm_get_vblks (struct block_device *bdev, unsigned long base,
+ struct ldmdb *ldb)
{
int size, perbuf, skip, finish, s, v, recs;
@@ -1472,5 +1461,5 @@
LIST_HEAD (frags);
- DEBUG_ON (!bdev || !ldb);
+ BUG_ON (!bdev || !ldb);
size = ldb->vm.vblk_size;
@@ -1527,5 +1516,5 @@
struct list_head *item, *tmp;
- DEBUG_ON (!lh);
+ BUG_ON (!lh);
list_for_each_safe (item, tmp, lh)
@@ -1561,5 +1550,5 @@
int err = -1;
- DEBUG_ON (!hd || !bdev);
+ BUG_ON (!hd || !bdev);
/* Look for signs of a Dynamic Disk */
Index: ldm.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -U2 -r1.48 -r1.49
--- ldm.h 20 Jun 2002 18:04:52 -0000 1.48
+++ ldm.h 21 Jun 2002 14:31:44 -0000 1.49
@@ -34,11 +34,4 @@
#include <asm/byteorder.h>
-enum {
- LDM_CRIT, /* critical conditions */
- LDM_ERR, /* error conditions */
- LDM_INFO, /* informative messages */
- LDM_DEBUG /* debug-level messages */
-};
-
/* Magic numbers in CPU format. */
#define MAGIC_VMDB 0x564D4442 /* VMDB */
|
|
From: Richard R. <fl...@us...> - 2002-06-20 18:05:33
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv23747/linux/fs/partitions
Modified Files:
ldm.c ldm.h
Log Message:
more trivial stuff
Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -U2 -r1.77 -r1.78
--- ldm.c 17 Jun 2002 01:28:57 -0000 1.77
+++ ldm.c 20 Jun 2002 18:04:51 -0000 1.78
@@ -27,5 +27,5 @@
#include <linux/slab.h>
#include <linux/pagemap.h>
-//#include <linux/stringify.h>
+#include <linux/stringify.h>
#include "ldm.h"
#include "check.h"
@@ -37,9 +37,9 @@
#ifdef CONFIG_BLK_DEV_MD
-extern void md_autodetect_dev(kdev_t dev);
+extern void md_autodetect_dev (kdev_t dev);
#endif
#ifdef CONFIG_LDM_MD
-extern void ldm_md_addpart(const u8 *dg_guid, u32 objid, u8 comptype,
+extern void ldm_md_addpart (const u8 *dg_guid, u32 objid, u8 comptype,
u8 n, u8 parts, u8 chunk_s, kdev_t dev);
#endif
@@ -87,12 +87,12 @@
__stringify (KBUILD_BASENAME);
#else
- "ldm.c"; // FIXME: __FILE__ is to verbose.
+ "ldm.c"; // FIXME: __FILE__ is too verbose.
#endif
- va_start(args, fmt);
- vsnprintf(buf, sizeof(buf), fmt, args);
- va_end(args);
+ va_start (args, fmt);
+ vsnprintf (buf, sizeof (buf), fmt, args);
+ va_end (args);
- printk("%s (%s, %d) %s(): %s\n", prefix[level], file, line, function,
+ printk ("%s (%s, %d) %s(): %s\n", prefix[level], file, line, function,
buf);
}
@@ -147,5 +147,5 @@
for (j = 0; j < 5; j++, src++)
for (i = 0; i < size[j]; i++, src+=2, *dest++ = v)
- if ((v = ldm_parse_hexbyte(src)) < 0)
+ if ((v = ldm_parse_hexbyte (src)) < 0)
return FALSE;
@@ -314,5 +314,5 @@
(ph1->config_start == ph2->config_start) &&
(ph1->config_size == ph2->config_size) &&
- !memcmp(ph1->disk_id, ph2->disk_id, GUID_SIZE));
+ !memcmp (ph1->disk_id, ph2->disk_id, GUID_SIZE));
}
@@ -336,8 +336,8 @@
(toc1->bitmap2_start == toc2->bitmap2_start) &&
(toc1->bitmap2_size == toc2->bitmap2_size) &&
- !strncmp(toc1->bitmap1_name, toc2->bitmap1_name,
- sizeof(toc1->bitmap1_name)) &&
- !strncmp(toc1->bitmap2_name, toc2->bitmap2_name,
- sizeof(toc1->bitmap2_name)));
+ !strncmp (toc1->bitmap1_name, toc2->bitmap1_name,
+ sizeof (toc1->bitmap1_name)) &&
+ !strncmp (toc1->bitmap2_name, toc2->bitmap2_name,
+ sizeof (toc1->bitmap2_name)));
}
@@ -391,5 +391,5 @@
goto out;
}
- result = ldm_parse_privhead(data, ph[i]);
+ result = ldm_parse_privhead (data, ph[i]);
put_dev_sector (sect);
if (!result) {
@@ -539,5 +539,5 @@
}
- if (!ldm_parse_vmdb(data, vm))
+ if (!ldm_parse_vmdb (data, vm))
goto out; /* Already logged */
@@ -601,5 +601,5 @@
p = (struct partition*)(data + 0x01BE);
for (i = 0; i < 4; i++, p++)
- if (SYS_IND(p) == WIN2K_DYNAMIC_PARTITION) {
+ if (SYS_IND (p) == WIN2K_DYNAMIC_PARTITION) {
result = TRUE;
break;
@@ -611,5 +611,5 @@
ldm_debug ("Found an MS-DOS partition table, not a dynamic disk.");
out:
- put_dev_sector(sect);
+ put_dev_sector (sect);
return result;
}
@@ -636,5 +636,5 @@
}
- ldm_debug("Search for vblk #%llu failed!", (unsigned long long) id);
+ ldm_debug ("Search for vblk #%llu failed!", (unsigned long long) id);
return NULL;
}
@@ -660,5 +660,5 @@
list_for_each (item, &ldb->v_disk) {
struct vblk *v = list_entry (item, struct vblk, list);
- if (!memcmp(v->vblk.disk.disk_id, ldb->ph.disk_id, GUID_SIZE))
+ if (!memcmp (v->vblk.disk.disk_id, ldb->ph.disk_id, GUID_SIZE))
return v;
}
@@ -747,5 +747,5 @@
#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 = mk_kdev (hd->major, minor);
#endif
vb = list_entry (item, struct vblk, list);
@@ -755,5 +755,5 @@
continue;
- if (!ldm_create_partition(hd, minor,
+ if (!ldm_create_partition (hd, minor,
part->start + ldb->ph.logical_disk_start, part->size))
continue; /* Already logged */
@@ -761,5 +761,5 @@
#ifdef CONFIG_BLK_DEV_MD
/* Try to get parent component */
- c = ldm_find_vblk(&ldb->v_comp, part->parent_id);
+ c = ldm_find_vblk (&ldb->v_comp, part->parent_id);
if (!c) {
ldm_error ("Can't find VBLK's parent (component).");
@@ -768,5 +768,5 @@
/* Try to get parent volume */
- v = ldm_find_vblk(&ldb->v_volu, c->vblk.comp.parent_id);
+ v = ldm_find_vblk (&ldb->v_volu, c->vblk.comp.parent_id);
if (v == NULL) {
ldm_error ("Can't find VBLK's parent (volume).");
@@ -776,10 +776,10 @@
/* Notify md of RAID autodetect part types */
if (v->vblk.volu.partition_type == LINUX_RAID_PARTITION) {
- md_autodetect_dev(dev);
+ md_autodetect_dev (dev);
continue;
}
/* Register to LDM_MD */
#ifdef CONFIG_LDM_MD
- ldm_md_addpart(v->vblk.volu.guid, c->obj_id,
+ ldm_md_addpart (v->vblk.volu.guid, c->obj_id,
c->vblk.comp.type, part->partnum, c->vblk.comp.children,
c->vblk.comp.chunksize / (4096 / 512), dev);
@@ -1292,5 +1292,5 @@
DEBUG_ON (!data || !ldb);
- vb = kmalloc (sizeof(*vb), GFP_KERNEL);
+ vb = kmalloc (sizeof (*vb), GFP_KERNEL);
if (!vb) {
ldm_crit ("Out of memory.");
@@ -1306,27 +1306,27 @@
case VBLK_DGR3:
case VBLK_DGR4:
- list_add(&vb->list, &ldb->v_dgrp);
+ list_add (&vb->list, &ldb->v_dgrp);
break;
case VBLK_DSK3:
case VBLK_DSK4:
- list_add(&vb->list, &ldb->v_disk);
+ list_add (&vb->list, &ldb->v_disk);
break;
case VBLK_VOL5:
- list_add(&vb->list, &ldb->v_volu);
+ list_add (&vb->list, &ldb->v_volu);
break;
case VBLK_CMP3:
- list_add(&vb->list, &ldb->v_comp);
+ list_add (&vb->list, &ldb->v_comp);
break;
case VBLK_PRT3:
/* Sort by the partition's start sector. */
- list_for_each(item, &ldb->v_part) {
- struct vblk *v = list_entry(item, struct vblk, list);
+ list_for_each (item, &ldb->v_part) {
+ struct vblk *v = list_entry (item, struct vblk, list);
if ((v->vblk.part.disk_id == vb->vblk.part.disk_id) &&
(v->vblk.part.start > vb->vblk.part.start)) {
- list_add_tail(&vb->list, &v->list);
+ list_add_tail (&vb->list, &v->list);
return TRUE;
}
}
- list_add_tail(&vb->list, &ldb->v_part);
+ list_add_tail (&vb->list, &ldb->v_part);
break;
}
@@ -1362,6 +1362,6 @@
}
- list_for_each(item, frags) {
- f = list_entry(item, struct frag, list);
+ list_for_each (item, frags) {
+ f = list_entry (item, struct frag, list);
if (f->group == group)
goto found;
@@ -1379,5 +1379,5 @@
f->map = 0xFF << num;
- list_add_tail(&f->list, frags);
+ list_add_tail (&f->list, frags);
found:
if (f->map & (1 << rec)) {
@@ -1412,6 +1412,6 @@
DEBUG_ON (!list);
- list_for_each_safe(item, tmp, list)
- kfree (list_entry(item, struct frag, list));
+ list_for_each_safe (item, tmp, list)
+ kfree (list_entry (item, struct frag, list));
}
@@ -1435,6 +1435,6 @@
DEBUG_ON (!frags || !ldb);
- list_for_each(item, frags) {
- f = list_entry(item, struct frag, list);
+ list_for_each (item, frags) {
+ f = list_entry (item, struct frag, list);
if (f->map != 0xFF) {
@@ -1464,5 +1464,5 @@
* FALSE An error occurred
*/
-static BOOL ldm_get_vblks(struct block_device *bdev, unsigned long base, struct ldmdb *ldb)
+static BOOL ldm_get_vblks (struct block_device *bdev, unsigned long base, struct ldmdb *ldb)
{
int size, perbuf, skip, finish, s, v, recs;
@@ -1470,5 +1470,5 @@
Sector sect;
BOOL result = FALSE;
- LIST_HEAD(frags);
+ LIST_HEAD (frags);
DEBUG_ON (!bdev || !ldb);
@@ -1502,5 +1502,5 @@
/* else Record is not in use, ignore it. */
}
- put_dev_sector(sect);
+ put_dev_sector (sect);
data = NULL;
}
@@ -1509,5 +1509,5 @@
out:
if (data)
- put_dev_sector(sect);
+ put_dev_sector (sect);
ldm_frag_free (&frags);
@@ -1586,9 +1586,9 @@
/* Initialize vblk lists in ldmdb struct */
- 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);
+ 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);
if (!ldm_get_vblks (bdev, base, ldb)) {
@@ -1605,9 +1605,9 @@
cleanup:
- 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);
+ 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);
out:
kfree (ldb);
Index: ldm.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -U2 -r1.47 -r1.48
--- ldm.h 17 Jun 2002 01:28:57 -0000 1.47
+++ ldm.h 20 Jun 2002 18:04:52 -0000 1.48
@@ -28,5 +28,7 @@
#include <linux/types.h>
+#include <linux/list.h>
#include <linux/genhd.h>
+#include <linux/fs.h>
#include <asm/unaligned.h>
#include <asm/byteorder.h>
@@ -97,5 +99,5 @@
#define OFF_VMDB 17 /* List of partitions. */
-#define WIN2K_DYNAMIC_PARTITION 0x42 /* Formerly SFS (Landis). */
+#define WIN2K_DYNAMIC_PARTITION 0x42 /* Formerly SFS (Landis). */
#define TOC_BITMAP1 "config" /* Names of the two defined */
@@ -107,14 +109,13 @@
#define BE64(x) ((u64)be64_to_cpu(get_unaligned((u64*)(x))))
-/* Borrowed from msdos.c. */
-#define SYS_IND(p) (get_unaligned(&p->sys_ind))
+/* Borrowed from msdos.c */
+#define SYS_IND(p) (get_unaligned(&(p)->sys_ind))
-/* VBLK Fragment handling */
-struct frag {
+struct frag { /* VBLK Fragment handling */
struct list_head list;
u32 group;
- u8 num; /* Total number of records */
- u8 rec; /* This is record number n */
- u8 map; /* Which portions are in use */
+ u8 num; /* Total number of records */
+ u8 rec; /* This is record number n */
+ u8 map; /* Which portions are in use */
u8 data[0];
};
@@ -143,5 +144,5 @@
};
-struct vmdb {
+struct vmdb { /* VMDB: The database header */
u16 ver_major;
u16 ver_minor;
@@ -151,5 +152,5 @@
};
-struct vblk_comp {
+struct vblk_comp { /* VBLK Component */
u8 state[16];
u64 parent_id;
@@ -159,16 +160,16 @@
};
-struct vblk_dgrp {
+struct vblk_dgrp { /* VBLK Disk Group */
u8 disk_id[64];
};
-struct vblk_disk {
+struct vblk_disk { /* VBLK Disk */
u8 disk_id[GUID_SIZE];
u8 alt_name[128];
};
-struct vblk_part { /* start, size and vol_off in sectors */
+struct vblk_part { /* VBLK Partition */
u64 start;
- u64 size;
+ u64 size; /* start, size and vol_off in sectors */
u64 volume_offset;
u64 parent_id;
@@ -177,5 +178,5 @@
};
-struct vblk_volu {
+struct vblk_volu { /* VBLK Volume */
u8 volume_type[16];
u8 volume_state[16];
@@ -186,5 +187,5 @@
};
-struct vblk_head {
+struct vblk_head { /* VBLK standard header */
u32 group;
u16 rec;
@@ -192,5 +193,5 @@
};
-struct vblk {
+struct vblk { /* Generalised VBLK */
u8 name[64];
u64 obj_id;
@@ -208,5 +209,5 @@
};
-struct ldmdb {
+struct ldmdb { /* Cache of the database */
struct privhead ph;
struct tocblock toc;
|
|
From: Richard R. <fl...@us...> - 2002-06-20 18:05:24
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/dynamic-disk/linux/Documentation In directory usw-pr-cvs1:/tmp/cvs-serv23747/linux/Documentation Modified Files: Configure.help-ldm Log Message: more trivial stuff Index: Configure.help-ldm =================================================================== RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/Documentation/Configure.help-ldm,v retrieving revision 1.5 retrieving revision 1.6 diff -U2 -r1.5 -r1.6 --- Configure.help-ldm 13 Nov 2001 13:58:43 -0000 1.5 +++ Configure.help-ldm 20 Jun 2002 18:04:49 -0000 1.6 @@ -1,3 +1,3 @@ -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 |
|
From: Richard R. <fl...@us...> - 2002-06-20 18:05:12
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/dynamic-disk/test
In directory usw-pr-cvs1:/tmp/cvs-serv23747/test
Modified Files:
compat.c ldminfo.c ldminfo.h
Log Message:
more trivial stuff
Index: compat.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/compat.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -U2 -r1.16 -r1.17
--- compat.c 17 Jun 2002 01:28:57 -0000 1.16
+++ compat.c 20 Jun 2002 18:04:55 -0000 1.17
@@ -61,4 +61,6 @@
{
//printf ("free %p in %s\n", objp, fn);
+ if (!objp)
+ return;
ldm_mem_free++;
ldm_mem_count--;
@@ -182,11 +184,13 @@
if (atomic_read (&page->count) < 1) {
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,8)
- if (page->buffers)
+ if ((page->buffers) && (page->buffers->b_data))
kfree (page->buffers->b_data);
- kfree (page->buffers);
+ if (page->buffers)
+ kfree (page->buffers);
#else
- if (page->private)
+ if ((page->private) && (((struct buffer_head*)(page->private))->b_data))
kfree (((struct buffer_head*)(page->private))->b_data);
- kfree ((void*)(page->private));
+ if (page->private);
+ kfree ((void*)(page->private));
#endif
kfree (page);
Index: ldminfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/ldminfo.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -U2 -r1.29 -r1.30
--- ldminfo.c 17 Jun 2002 01:28:57 -0000 1.29
+++ ldminfo.c 20 Jun 2002 18:04:55 -0000 1.30
@@ -51,5 +51,5 @@
numeric = isdigit (name[strlen (name) - 1]);
- printf ("Device | Offset Bytes Sectors Mb | Size Bytes Sectors Mb\n"
+ printf ("Device | Offset Bytes Sectors MiB | Size Bytes Sectors MiB\n"
"-------------+--------------------------------+-------------------------------\n");
for (i = 0; i < 256; i++) {
@@ -138,4 +138,5 @@
int ver = 0;
struct block_device bdev;
+ struct stat st;
for (a = 1; a < argc; a++) {
@@ -180,4 +181,14 @@
if (!argv[a][0])
continue;
+
+ if (stat (argv[a], &st)) {
+ printf ("Couldn't open device: %s\n", argv[a]);
+ break;
+ }
+
+ if ((!S_ISBLK (st.st_rdev)) && (!S_ISREG (st.st_rdev))) {
+ printf ("Couldn't open device: %s\n", argv[a]);
+ break;
+ }
device = open64 (argv[a], O_RDONLY);
Index: ldminfo.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/ldminfo.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -U2 -r1.16 -r1.17
--- ldminfo.h 17 Jun 2002 01:28:57 -0000 1.16
+++ ldminfo.h 20 Jun 2002 18:04:56 -0000 1.17
@@ -9,4 +9,5 @@
#include <linux/genhd.h>
#include <linux/list.h>
+//#include <linux/buffer_head.h>
#include <features.h>
@@ -104,4 +105,5 @@
int isdigit (int c);
char * basename(const char *filename);
+int stat (const char *file_name, struct stat *buf);
#endif // __LDMINFO_H_
|
|
From: Richard R. <fl...@us...> - 2002-06-17 01:29:01
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv5158/linux/fs/partitions
Modified Files:
ldm.c ldm.h ldm_md.c
Log Message:
redo previous sweeping changes (typo)
calculate some memory stats
Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -U2 -r1.76 -r1.77
--- ldm.c 17 Jun 2002 00:15:13 -0000 1.76
+++ ldm.c 17 Jun 2002 01:28:57 -0000 1.77
@@ -624,7 +624,7 @@
*/
#ifdef CONFIG_BLK_DEV_MD
-static struct vblk * ldm_find_vblk (const struct list *lh_vl, u64 id)
+static struct vblk * ldm_find_vblk (const struct list_head *lh_vl, u64 id)
{
- struct list *item;
+ struct list_head *item;
DEBUG_ON (!lh_vl);
@@ -654,5 +654,5 @@
static struct vblk * ldm_get_disk_objid (const struct ldmdb *ldb)
{
- struct list *item;
+ struct list_head *item;
DEBUG_ON (!ldb);
@@ -722,5 +722,5 @@
unsigned long first_sector, int first_minor, const struct ldmdb *ldb)
{
- struct list *item;
+ struct list_head *item;
struct vblk_part *part;
struct vblk *disk;
@@ -1288,5 +1288,5 @@
{
struct vblk *vb;
- struct list *item;
+ struct list_head *item;
DEBUG_ON (!data || !ldb);
@@ -1346,8 +1346,8 @@
* FALSE Error, a problem occurred
*/
-static BOOL ldm_frag_add (const u8 *data, int size, struct list *frags)
+static BOOL ldm_frag_add (const u8 *data, int size, struct list_head *frags)
{
struct frag *f;
- struct list *item;
+ struct list_head *item;
int rec, num, group;
@@ -1406,7 +1406,7 @@
* Return: none
*/
-static void ldm_frag_free (struct list *list)
+static void ldm_frag_free (struct list_head *list)
{
- struct list *item, *tmp;
+ struct list_head *item, *tmp;
DEBUG_ON (!list);
@@ -1427,8 +1427,8 @@
* FALSE One or more of the fragments we invalid
*/
-static BOOL ldm_frag_commit (struct list *frags, struct ldmdb *ldb)
+static BOOL ldm_frag_commit (struct list_head *frags, struct ldmdb *ldb)
{
struct frag *f;
- struct list *item;
+ struct list_head *item;
BOOL result = FALSE;
@@ -1523,7 +1523,7 @@
* Return: none
*/
-static void ldm_free_vblks (struct list *lh)
+static void ldm_free_vblks (struct list_head *lh)
{
- struct list *item, *tmp;
+ struct list_head *item, *tmp;
DEBUG_ON (!lh);
Index: ldm.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -U2 -r1.46 -r1.47
--- ldm.h 17 Jun 2002 00:15:13 -0000 1.46
+++ ldm.h 17 Jun 2002 01:28:57 -0000 1.47
@@ -112,5 +112,5 @@
/* VBLK Fragment handling */
struct frag {
- struct list list;
+ struct list_head list;
u32 group;
u8 num; /* Total number of records */
@@ -205,5 +205,5 @@
struct vblk_volu volu;
} vblk;
- struct list list;
+ struct list_head list;
};
@@ -212,9 +212,9 @@
struct tocblock toc;
struct vmdb vm;
- struct list v_dgrp;
- struct list v_disk;
- struct list v_volu;
- struct list v_comp;
- struct list v_part;
+ 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;
};
Index: ldm_md.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm_md.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- ldm_md.c 17 Jun 2002 00:15:13 -0000 1.7
+++ ldm_md.c 17 Jun 2002 01:28:57 -0000 1.8
@@ -80,5 +80,5 @@
// Entry in volume list
typedef struct {
- struct list list;
+ struct list_head list;
u8 dg_guid[16]; // diskgroup GUID
u32 objid; // volume id
@@ -168,5 +168,5 @@
u8 level, u8 parts, u8 chunk_s)
{
- struct list *item;
+ struct list_head *item;
_ldm_md_t* vol;
@@ -210,5 +210,5 @@
void ldm_md_destroy(void)
{
- struct list *item, *tmp;
+ struct list_head *item, *tmp;
list_for_each_safe (item, tmp, &_vols)
@@ -275,5 +275,5 @@
void ldm_md_flush(void)
{
- struct list *item, *tmp;
+ struct list_head *item, *tmp;
static int minor = CONFIG_LDM_MD_MINOR;
|
|
From: Richard R. <fl...@us...> - 2002-06-17 01:29:01
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/dynamic-disk In directory usw-pr-cvs1:/tmp/cvs-serv5158 Modified Files: README Log Message: redo previous sweeping changes (typo) calculate some memory stats Index: README =================================================================== RCS file: /cvsroot/linux-ntfs/dynamic-disk/README,v retrieving revision 1.8 retrieving revision 1.9 diff -U2 -r1.8 -r1.9 --- README 9 Oct 2001 14:50:39 -0000 1.8 +++ README 17 Jun 2002 01:28:57 -0000 1.9 @@ -32,9 +32,8 @@ -------+--------------------------------+------------------------------- 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 + hdb1 | 32256 63 0 | 5242880 10240 5 + hdb2 | 5275136 10303 5 | 5242880 10240 5 + hdb3 | 10518016 20543 10 | 3145728 6144 3 + hdb4 | 13663744 26687 13 | 6291456 12288 6 |
|
From: Richard R. <fl...@us...> - 2002-06-17 01:29:01
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/dynamic-disk/test
In directory usw-pr-cvs1:/tmp/cvs-serv5158/test
Modified Files:
compat.c dump.c ldminfo.c ldminfo.h
Log Message:
redo previous sweeping changes (typo)
calculate some memory stats
Index: compat.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/compat.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- compat.c 17 Jun 2002 00:15:13 -0000 1.15
+++ compat.c 17 Jun 2002 01:28:57 -0000 1.16
@@ -38,13 +38,22 @@
void __brelse (struct buffer_head * buf);
-int ldm_a = 0;
-int ldm_f = 0;
+int ldm_mem_alloc = 0; /* Number of allocations */
+int ldm_mem_free = 0; /* Number of frees */
+int ldm_mem_size = 0; /* Memory allocated */
+int ldm_mem_maxa = 0; /* Max memory allocated */
+int ldm_mem_count = 0; /* Number of memory blocks */
+int ldm_mem_maxc = 0; /* Max memory blocks */
void * __kmalloc (size_t size, int flags, char *fn)
{
- void *ptr = malloc (size);
+ void *ptr = malloc (size + sizeof (int));
//printf ("malloc %p %6zu in %s\n", ptr, size, fn);
- ldm_a++;
- return ptr;
+ ldm_mem_alloc++;
+ ldm_mem_size += size;
+ ldm_mem_maxa = max (ldm_mem_maxa, ldm_mem_size);
+ ldm_mem_count++;
+ ldm_mem_maxc = max (ldm_mem_maxc, ldm_mem_count);
+ *((int *)ptr) = size;
+ return (ptr + sizeof (int));
}
@@ -52,6 +61,8 @@
{
//printf ("free %p in %s\n", objp, fn);
- ldm_f++;
- free ((void *)objp);
+ ldm_mem_free++;
+ ldm_mem_count--;
+ ldm_mem_size -= *((int *)(objp - sizeof (int)));
+ free ((void *)(objp - sizeof (int)));
}
Index: dump.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/dump.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- dump.c 17 Jun 2002 00:15:13 -0000 1.13
+++ dump.c 17 Jun 2002 01:28:57 -0000 1.14
@@ -139,5 +139,5 @@
static int dump_vmdb (struct ldmdb *ldb)
{
- struct list *item;
+ struct list_head *item;
struct vmdb *vm = &ldb->vm;
@@ -214,5 +214,5 @@
static int dump_disks (struct ldmdb *ldb)
{
- struct list *disk_item, *part_item;
+ struct list_head *disk_item, *part_item;
struct vblk *disk_vb, *part_vb;
@@ -249,5 +249,5 @@
static int dump_volumes (struct ldmdb *ldb)
{
- struct list *volu_item, *comp_item, *part_item;
+ struct list_head *volu_item, *comp_item, *part_item;
struct vblk *volu_vb, *comp_vb, *part_vb;
Index: ldminfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/ldminfo.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -U2 -r1.28 -r1.29
--- ldminfo.c 17 Jun 2002 00:15:13 -0000 1.28
+++ ldminfo.c 17 Jun 2002 01:28:57 -0000 1.29
@@ -241,5 +241,5 @@
close (device);
- //printf ("%d/%d\n", ldm_a, ldm_f);
+ //printf ("%d/%d %d,%d\n", ldm_mem_alloc, ldm_mem_free, ldm_mem_maxa, ldm_mem_maxc);
return 0;
}
Index: ldminfo.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/ldminfo.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- ldminfo.h 17 Jun 2002 00:15:13 -0000 1.15
+++ ldminfo.h 17 Jun 2002 01:28:57 -0000 1.16
@@ -55,6 +55,10 @@
extern int debug;
-extern int ldm_a;
-extern int ldm_f;
+extern int ldm_mem_alloc;
+extern int ldm_mem_free;
+extern int ldm_mem_size;
+extern int ldm_mem_maxa;
+extern int ldm_mem_count;
+extern int ldm_mem_maxc;
extern struct proc_dir_entry *proc_root_fs;
@@ -84,8 +88,8 @@
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 *lh_bh, struct list *lh_vl);
+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 *bh);
-void ldm_free_vblks (struct list *vb);
+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);
|
|
From: Richard R. <fl...@us...> - 2002-06-17 00:15:16
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv1138/linux/fs/partitions
Modified Files:
ldm.c ldm.h ldm_md.c
Log Message:
reverted list_t following lkml thread
Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -U2 -r1.75 -r1.76
--- ldm.c 20 Apr 2002 16:51:43 -0000 1.75
+++ ldm.c 17 Jun 2002 00:15:13 -0000 1.76
@@ -3,5 +3,5 @@
*
* Copyright (C) 2001,2002 Richard Russon <ld...@fl...>
- * Copyright (C) 2001 Anton Altaparmakov <an...@us...>
+ * Copyright (C) 2001 Anton Altaparmakov <ai...@ca...>
* Copyright (C) 2001,2002 Jakob Kemi <jak...@te...>
*
@@ -27,5 +27,5 @@
#include <linux/slab.h>
#include <linux/pagemap.h>
-#include <linux/stringify.h>
+//#include <linux/stringify.h>
#include "ldm.h"
#include "check.h"
@@ -624,7 +624,7 @@
*/
#ifdef CONFIG_BLK_DEV_MD
-static struct vblk * ldm_find_vblk (const list_t *lh_vl, u64 id)
+static struct vblk * ldm_find_vblk (const struct list *lh_vl, u64 id)
{
- list_t *item;
+ struct list *item;
DEBUG_ON (!lh_vl);
@@ -654,5 +654,5 @@
static struct vblk * ldm_get_disk_objid (const struct ldmdb *ldb)
{
- list_t *item;
+ struct list *item;
DEBUG_ON (!ldb);
@@ -722,5 +722,5 @@
unsigned long first_sector, int first_minor, const struct ldmdb *ldb)
{
- list_t *item;
+ struct list *item;
struct vblk_part *part;
struct vblk *disk;
@@ -740,4 +740,6 @@
minor = first_minor;
+ printk (" [LDM]");
+
/* Create the data partitions */
list_for_each (item, &ldb->v_part) {
@@ -1286,5 +1288,5 @@
{
struct vblk *vb;
- list_t *item;
+ struct list *item;
DEBUG_ON (!data || !ldb);
@@ -1344,8 +1346,8 @@
* FALSE Error, a problem occurred
*/
-static BOOL ldm_frag_add (const u8 *data, int size, list_t *frags)
+static BOOL ldm_frag_add (const u8 *data, int size, struct list *frags)
{
struct frag *f;
- list_t *item;
+ struct list *item;
int rec, num, group;
@@ -1404,7 +1406,7 @@
* Return: none
*/
-static void ldm_frag_free (list_t *list)
+static void ldm_frag_free (struct list *list)
{
- list_t *item, *tmp;
+ struct list *item, *tmp;
DEBUG_ON (!list);
@@ -1425,8 +1427,8 @@
* FALSE One or more of the fragments we invalid
*/
-static BOOL ldm_frag_commit (list_t *frags, struct ldmdb *ldb)
+static BOOL ldm_frag_commit (struct list *frags, struct ldmdb *ldb)
{
struct frag *f;
- list_t *item;
+ struct list *item;
BOOL result = FALSE;
@@ -1521,7 +1523,7 @@
* Return: none
*/
-static void ldm_free_vblks (list_t *lh)
+static void ldm_free_vblks (struct list *lh)
{
- list_t *item, *tmp;
+ struct list *item, *tmp;
DEBUG_ON (!lh);
@@ -1582,8 +1584,4 @@
!ldm_validate_vmdb (bdev, base, ldb))
goto out;
-
- /* Create the LDM database device. */
- if (!ldm_create_partition (hd, first_minor++, base, ldb->ph.config_size))
- goto out;
/* Initialize vblk lists in ldmdb struct */
Index: ldm.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -U2 -r1.45 -r1.46
--- ldm.h 20 Apr 2002 16:51:43 -0000 1.45
+++ ldm.h 17 Jun 2002 00:15:13 -0000 1.46
@@ -6,5 +6,5 @@
*
* Copyright (C) 2001,2002 Richard Russon <ld...@fl...>
- * Copyright (C) 2001 Anton Altaparmakov <an...@us...>
+ * Copyright (C) 2001 Anton Altaparmakov <ai...@ca...>
* Copyright (C) 2001,2002 Jakob Kemi <jak...@te...>
*
@@ -112,10 +112,10 @@
/* VBLK Fragment handling */
struct frag {
- list_t list;
- u32 group;
- u8 num; /* Total number of records */
- u8 rec; /* This is record number n */
- u8 map; /* Which portions are in use */
- u8 data[0];
+ struct list list;
+ u32 group;
+ u8 num; /* Total number of records */
+ u8 rec; /* This is record number n */
+ u8 map; /* Which portions are in use */
+ u8 data[0];
};
@@ -205,5 +205,5 @@
struct vblk_volu volu;
} vblk;
- list_t list;
+ struct list list;
};
@@ -212,9 +212,9 @@
struct tocblock toc;
struct vmdb vm;
- list_t v_dgrp;
- list_t v_disk;
- list_t v_volu;
- list_t v_comp;
- list_t v_part;
+ struct list v_dgrp;
+ struct list v_disk;
+ struct list v_volu;
+ struct list v_comp;
+ struct list v_part;
};
@@ -223,2 +223,3 @@
#endif /* _FS_PT_LDM_H_ */
+
Index: ldm_md.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm_md.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- ldm_md.c 27 Feb 2002 17:40:20 -0000 1.6
+++ ldm_md.c 17 Jun 2002 00:15:13 -0000 1.7
@@ -80,12 +80,12 @@
// Entry in volume list
typedef struct {
- list_t list;
- u8 dg_guid[16]; // diskgroup GUID
- u32 objid; // volume id
- u8 level; // RAID-level
- u8 parts; // number of parts in set
- u8 chunk_s; // size of chunks
- u8 added; // parts added
- kdev_t* kdevs; // array of devs for the whole set
+ struct list list;
+ u8 dg_guid[16]; // diskgroup GUID
+ u32 objid; // volume id
+ u8 level; // RAID-level
+ u8 parts; // number of parts in set
+ u8 chunk_s; // size of chunks
+ u8 added; // parts added
+ kdev_t* kdevs; // array of devs for the whole set
} _ldm_md_t;
@@ -168,5 +168,5 @@
u8 level, u8 parts, u8 chunk_s)
{
- list_t *item;
+ struct list *item;
_ldm_md_t* vol;
@@ -210,5 +210,5 @@
void ldm_md_destroy(void)
{
- list_t *item, *tmp;
+ struct list *item, *tmp;
list_for_each_safe (item, tmp, &_vols)
@@ -275,5 +275,5 @@
void ldm_md_flush(void)
{
- list_t *item, *tmp;
+ struct list *item, *tmp;
static int minor = CONFIG_LDM_MD_MINOR;
|
|
From: Richard R. <fl...@us...> - 2002-06-17 00:15:16
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/dynamic-disk/test
In directory usw-pr-cvs1:/tmp/cvs-serv1138/test
Modified Files:
compat.c dump.c extra.h ldminfo.c ldminfo.h
Log Message:
reverted list_t following lkml thread
Index: compat.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/compat.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- compat.c 18 Apr 2002 23:23:19 -0000 1.14
+++ compat.c 17 Jun 2002 00:15:13 -0000 1.15
@@ -66,4 +66,7 @@
va_end (args);
+ if ((!debug) && (!strcmp (buf, " [LDM]")))
+ return 0;
+
if (ignore) {
ignore = (strchr (buf, '\n') == NULL);
Index: dump.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/dump.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- dump.c 10 Apr 2002 15:42:00 -0000 1.12
+++ dump.c 17 Jun 2002 00:15:13 -0000 1.13
@@ -139,5 +139,5 @@
static int dump_vmdb (struct ldmdb *ldb)
{
- list_t *item;
+ struct list *item;
struct vmdb *vm = &ldb->vm;
@@ -214,5 +214,5 @@
static int dump_disks (struct ldmdb *ldb)
{
- list_t *disk_item, *part_item;
+ struct list *disk_item, *part_item;
struct vblk *disk_vb, *part_vb;
@@ -249,5 +249,5 @@
static int dump_volumes (struct ldmdb *ldb)
{
- list_t *volu_item, *comp_item, *part_item;
+ struct list *volu_item, *comp_item, *part_item;
struct vblk *volu_vb, *comp_vb, *part_vb;
Index: extra.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/extra.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- extra.h 17 Feb 2002 22:13:34 -0000 1.3
+++ extra.h 17 Jun 2002 00:15:13 -0000 1.4
@@ -20,10 +20,10 @@
#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,2)
-typedef struct list_head list_t;
-#endif
-
#include <linux/slab.h>
#include <linux/pagemap.h>
+
+#define KDEV_MINOR_BITS 8
+#define __mkdev(major,minor) (((major) << KDEV_MINOR_BITS) + (minor))
+#define mk_kdev(major, minor) ((kdev_t) { __mkdev(major,minor) } )
void * __kmalloc (size_t size, int flags, char *fn);
Index: ldminfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/ldminfo.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -U2 -r1.27 -r1.28
--- ldminfo.c 25 Apr 2002 12:01:52 -0000 1.27
+++ ldminfo.c 17 Jun 2002 00:15:13 -0000 1.28
@@ -103,7 +103,4 @@
return -1;
- if (!ldm_create_partition (hd, first_minor++, base, ldb->ph.config_size))
- goto free_buffers;
-
if (!ldm_get_vblks (bdev, base, ldb)) {
printk (LDM_CRIT "get vblks failed\n");
Index: ldminfo.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/ldminfo.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- ldminfo.h 10 Apr 2002 15:42:01 -0000 1.14
+++ ldminfo.h 17 Jun 2002 00:15:13 -0000 1.15
@@ -84,8 +84,8 @@
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, list_t *lh_bh, list_t *lh_vl);
+int ldm_get_buffers (struct block_device *bdev, unsigned long base, struct vmdb *vm, struct list *lh_bh, struct list *lh_vl);
struct vblk * ldm_get_disk_objid (const struct ldmdb *ldb);
-void ldm_free_buffers (list_t *bh);
-void ldm_free_vblks (list_t *vb);
+void ldm_free_buffers (struct list *bh);
+void ldm_free_vblks (struct list *vb);
int ldm_get_vblks(struct block_device *bdev, unsigned long base, struct ldmdb *ldb);
int ldm_combine_vblks (struct ldmdb *ldb);
|
|
From: Richard R. <fl...@us...> - 2002-06-17 00:15:16
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/dynamic-disk In directory usw-pr-cvs1:/tmp/cvs-serv1138 Modified Files: ChangeLog Log Message: reverted list_t following lkml thread Index: ChangeLog =================================================================== RCS file: /cvsroot/linux-ntfs/dynamic-disk/ChangeLog,v retrieving revision 1.16 retrieving revision 1.17 diff -U2 -r1.16 -r1.17 --- ChangeLog 25 Apr 2002 12:01:52 -0000 1.16 +++ ChangeLog 17 Jun 2002 00:15:13 -0000 1.17 @@ -49,5 +49,5 @@ * Build fixes. It should now compile cleanly against late 2.4 and 2.5, without resorting to black arts. - * Tidied code, BUG_ON, list_t, BOOL, __attribute__ printf + * Tidied code, BUG_ON, BOOL, __attribute__ printf 2001-12-31 Richard Russon <ld...@fl...> |
|
From: Anton A. <an...@us...> - 2002-06-08 14:33:12
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs In directory usw-pr-cvs1:/tmp/cvs-serv31660 Modified Files: TODO.libntfs TODO.ntfsfix Log Message: Few odds and ends. Index: TODO.libntfs =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/TODO.libntfs,v retrieving revision 1.7 retrieving revision 1.8 diff -U2 -r1.7 -r1.8 --- TODO.libntfs 7 Jun 2002 01:16:20 -0000 1.7 +++ TODO.libntfs 8 Jun 2002 14:33:09 -0000 1.8 @@ -3,5 +3,5 @@ ***************** -- write/port index_list/readdir function (see ntfs tng driver) +- add read of compressed attributes ******************* @@ -14,7 +14,7 @@ - enable automatic creation of API reference -- add read/write of compressed attributes +- add write of compressed attributes -- write attribute resize function (see mkntfs) +- write attribute resize function (see mkntfs) and implement ntfs_truncate* - extend ntfs_attr_pwrite to cope with extending the attribute size and with Index: TODO.ntfsfix =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/TODO.ntfsfix,v retrieving revision 1.3 retrieving revision 1.4 diff -U2 -r1.3 -r1.4 --- TODO.ntfsfix 2 Jun 2002 23:02:20 -0000 1.3 +++ TODO.ntfsfix 8 Jun 2002 14:33:09 -0000 1.4 @@ -9,7 +9,4 @@ * 1. Delete file $UsnJrnl from /$Extend directory. * -* 2. Walk the mft and for each record set the usn in the standard information -* attribute to zero. (This can take a while on large volumes.) -* * - On ntfs 3.0+ volumes need to mark the quota out of date? - Probably, but * it shouldn't cause any corruption not doing so for the moment so this is |
|
From: Anton A. <an...@us...> - 2002-06-08 14:12:10
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs In directory usw-pr-cvs1:/tmp/cvs-serv27454 Modified Files: ChangeLog Log Message: ntfs_readdir() has arrived. Index: ChangeLog =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/ChangeLog,v retrieving revision 1.62 retrieving revision 1.63 diff -U2 -r1.62 -r1.63 --- ChangeLog 6 Jun 2002 20:47:28 -0000 1.62 +++ ChangeLog 8 Jun 2002 14:12:00 -0000 1.63 @@ -104,5 +104,6 @@ - Change ntfsfix to take into account the automatic mft mirror updates. - Add new API provided by new files dir.[ch]: - ntfs_lookup_inode_by_name(). + ntfs_lookup_inode_by_name(), and + ntfs_readdir(). 12/03/2002 - 1.6.0 - More mkntfs options and cleanups. |
|
From: Anton A. <an...@us...> - 2002-06-08 14:12:10
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv27454/libntfs
Modified Files:
attrib.c dir.c mft.c
Log Message:
ntfs_readdir() has arrived.
Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/attrib.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -U2 -r1.44 -r1.45
--- attrib.c 7 Jun 2002 01:16:20 -0000 1.44
+++ attrib.c 8 Jun 2002 14:12:01 -0000 1.45
@@ -469,5 +469,5 @@
Dprintf(__FUNCTION__ "(): Entering for inode 0x%Lx, attr 0x%x.\n",
- ni->mft_no, type);
+ (unsigned long long)ni->mft_no, type);
if (!ni || !ni->vol || !ni->mrec) {
errno = EINVAL;
@@ -1446,6 +1446,6 @@
Dprintf(__FUNCTION__ "(): Entering for inode 0x%Lx, attr 0x%x, "
- "vcn 0x%Lx.\n", na->ni->mft_no, na->type,
- (long long)vcn);
+ "vcn 0x%Lx.\n", (unsigned long long)na->ni->mft_no,
+ na->type, (long long)vcn);
ctx = ntfs_get_attr_search_ctx(na->ni, NULL);
@@ -1677,6 +1677,7 @@
Dprintf(__FUNCTION__ "(): Entering for inode 0x%Lx, attr 0x%x, pos "
- "0x%Lx, count 0x%Lx.\n", na->ni->mft_no, na->type, pos,
- count);
+ "0x%Lx, count 0x%Lx.\n",
+ (unsigned long long)na->ni->mft_no, na->type,
+ (long long)pos, (long long)count);
if (!na || !na->ni || !na->ni->vol || !b || pos < 0 || count < 0) {
errno = EINVAL;
@@ -1854,6 +1855,6 @@
Dprintf(__FUNCTION__ "(): Entering for inode 0x%Lx, attr 0x%x, pos "
- "0x%Lx, count 0x%Lx.\n", na->ni->mft_no, na->type, pos,
- count);
+ "0x%Lx, count 0x%Lx.\n", na->ni->mft_no, na->type,
+ (long long)pos, (long long)count);
if (!na || !na->ni || !na->ni->vol || !b || pos < 0 || count < 0) {
errno = EINVAL;
@@ -2157,5 +2158,6 @@
Dprintf(__FUNCTION__ "(): Entering for inode 0x%Lx, attr type 0x%x, "
- "pos 0x%Lx.\n", na->ni->mft_no, na->type, pos);
+ "pos 0x%Lx.\n", (unsigned long long)na->ni->mft_no,
+ na->type, (long long)pos);
if (bk_cnt < 0 || bk_size % NTFS_SECTOR_SIZE) {
errno = EINVAL;
@@ -2208,5 +2210,6 @@
Dprintf(__FUNCTION__ "(): Entering for inode 0x%Lx, attr type 0x%x, "
- "pos 0x%Lx.\n", na->ni->mft_no, na->type, pos);
+ "pos 0x%Lx.\n", (unsigned long long)na->ni->mft_no,
+ na->type, (long long)pos);
if (bk_cnt < 0 || bk_size % NTFS_SECTOR_SIZE) {
errno = EINVAL;
Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/dir.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- dir.c 6 Jun 2002 20:47:33 -0000 1.2
+++ dir.c 8 Jun 2002 14:12:01 -0000 1.3
@@ -37,6 +37,6 @@
*/
uchar_t I30[5] = { const_cpu_to_le16('$'), const_cpu_to_le16('I'),
- const_cpu_to_le16('3'), const_cpu_to_le16('0'),
- const_cpu_to_le16(0) };
+ const_cpu_to_le16('3'), const_cpu_to_le16('0'),
+ const_cpu_to_le16('\0') };
/**
@@ -100,5 +100,5 @@
goto put_err_out;
}
- /* Get to the index root value (it's been verified in read_inode). */
+ /* Get to the index root value. */
ir = (INDEX_ROOT*)((__u8*)ctx->attr +
le16_to_cpu(ctx->attr->value_offset));
@@ -241,5 +241,4 @@
if (!ia) {
Dperror("Failed to allocate buffer for index block");
-
goto put_err_out;
}
@@ -280,6 +279,5 @@
Dprintf("Index buffer (VCN 0x%Lx) of directory inode 0x%Lx "
"has a size (%u) differing from the directory "
- "specified size (%u). Directory inode is "
- "corrupt or driver bug.\n", (long long)vcn,
+ "specified size (%u).\n", (long long)vcn,
(unsigned long long)dir_ni->mft_no,
le32_to_cpu(ia->index.allocated_size) + 0x18,
@@ -451,4 +449,477 @@
ntfs_attr_close(ia_na);
goto eo_put_err_out;
+}
+
+typedef union {
+ INDEX_ROOT *ir;
+ INDEX_ALLOCATION *ia;
+} index_union __attribute__ ((__transparent_union__));
+
+typedef enum {
+ INDEX_TYPE_ROOT, /* index root */
+ INDEX_TYPE_ALLOCATION, /* index allocation */
+} INDEX_TYPE;
+
+/*
+ * Internal function:
+ *
+ * ntfs_filldir - ntfs specific filldir method
+ * @dir_ni: ntfs inode of current directory
+ * @pos: current position in directory
+ * @ivcn_bits: log(2) of index vcn size
+ * @index_type: specifies whether @iu is an index root or an index allocation
+ * @iu: index root or index block to which @ie belongs
+ * @ie: current index entry
+ * @dirent: context for filldir callback supplied by the caller
+ * @filldir: filldir callback supplied by the caller
+ *
+ * Pass information specifying the current directory entry @ie to the @filldir
+ * callback.
+ */
+static inline int ntfs_filldir(ntfs_inode *dir_ni, __s64 *pos, __u8 ivcn_bits,
+ const INDEX_TYPE index_type, index_union iu, INDEX_ENTRY *ie,
+ void *dirent, ntfs_filldir_t filldir)
+{
+ FILE_NAME_ATTR *fn = &ie->key.file_name;
+ unsigned dt_type;
+
+ /* Advance the position even if going to skip the entry. */
+ if (index_type == INDEX_TYPE_ALLOCATION)
+ *pos = (__u8*)ie - (__u8*)iu.ia + (sle64_to_cpu(
+ iu.ia->index_block_vcn) << ivcn_bits) +
+ dir_ni->vol->mft_record_size;
+ else /* if (index_type == INDEX_TYPE_ROOT) */
+ *pos = (__u8*)ie - (__u8*)iu.ir;
+ /* Skip root directory self reference entry. */
+ if (MREF_LE(ie->indexed_file) == FILE_root)
+ return 0;
+ if (ie->key.file_name.file_attributes &
+ FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT)
+ dt_type = NTFS_DT_DIR;
+ else
+ dt_type = NTFS_DT_REG;
+ return filldir(dirent, fn->file_name, fn->file_name_length,
+ fn->file_name_type, *pos,
+ le64_to_cpu(ie->indexed_file), dt_type);
+}
+
+/*
+ * Internal function:
+ *
+ * ntfs_get_parent_mft_ref - find mft reference of parent directory of an inode
+ * @ni: ntfs inode whose parent directory to find
+ *
+ * Find the parent directory of the ntfs inode @ni. To do this, find the first
+ * file name attribute in the mft record of @ni and return the parent mft
+ * reference from that.
+ *
+ * Note this only makes sense for directories, since files can be hard linked
+ * from multiple directories and there is no way for us to tell which one is
+ * being looked for.
+ *
+ * Technically directories can have hard links, too, but we consider that as
+ * illegal as Linux/UNIX do not support directory hard links.
+ *
+ * Return the mft reference of the parent directory on success or -1 on error
+ * with errno set to the error code.
+ */
+static MFT_REF ntfs_get_parent_mft_ref(ntfs_inode *ni)
+{
+ MFT_REF mref;
+ ntfs_attr_search_ctx *ctx;
+ FILE_NAME_ATTR *fn;
+ int eo;
+
+ if (!ni) {
+ errno = EINVAL;
+ return -1;
+ }
+
+ ctx = ntfs_get_attr_search_ctx(ni, NULL);
+ if (!ctx)
+ return -1;
+ if (ntfs_lookup_attr(AT_FILE_NAME, NULL, 0, 0, 0, NULL, 0, ctx)) {
+ Dprintf("No file name found in inode 0x%Lx. Corrupt inode.\n",
+ (unsigned long long)ni->mft_no);
+ goto err_out;
+ }
+ if (ctx->attr->non_resident) {
+ Dprintf("File name attribute must be resident. Corrupt inode "
+ "0x%Lx.\n", (unsigned long long)ni->mft_no);
+ goto io_err_out;
+ }
+ fn = (FILE_NAME_ATTR*)((__u8*)ctx->attr +
+ le16_to_cpu(ctx->attr->value_offset));
+ if ((__u8*)fn + le32_to_cpu(ctx->attr->value_length) >
+ (__u8*)ctx->attr + le32_to_cpu(ctx->attr->length)) {
+ Dprintf("Corrupt file name attribute in inode 0x%Lx.\n",
+ (unsigned long long)ni->mft_no);
+ goto io_err_out;
+ }
+ mref = le64_to_cpu(fn->parent_directory);
+ ntfs_put_attr_search_ctx(ctx);
+ return mref;
+io_err_out:
+ errno = EIO;
+err_out:
+ eo = errno;
+ ntfs_put_attr_search_ctx(ctx);
+ errno = eo;
+ return -1;
+}
+
+/**
+ * The little endian Unicode string .. as a static global constant.
+ */
+static const uchar_t dotdot[3] = { const_cpu_to_le16('.'),
+ const_cpu_to_le16('.'),
+ const_cpu_to_le16('\0') };
+
+/**
+ * ntfs_readdir - read the contents of an ntfs directory
+ * @dir_ni: ntfs inode of current directory
+ * @pos: current position in directory
+ * @dirent: context for filldir callback supplied by the caller
+ * @filldir: filldir callback supplied by the caller
+ *
+ * Parse the index root and the index blocks that are marked in use in the
+ * index bitmap and hand each found directory entry to the @filldir callback
+ * supplied by the caller.
+ *
+ * Return 0 on success or -1 on error with errno set to the error code.
+ *
+ * Note: Index blocks are parsed in ascending vcn order, from which follows
+ * that the directory entries are not returned sorted.
+ */
+int ntfs_readdir(ntfs_inode *dir_ni, __s64 *pos,
+ void *dirent, ntfs_filldir_t filldir)
+{
+ __s64 i_size, br, ia_pos, bmp_pos, ia_start;
+ ntfs_volume *vol;
+ ntfs_attr *ia_na, *bmp_na = NULL;
+ ntfs_attr_search_ctx *ctx = NULL;
+ __u8 *index_end, *bmp;
+ INDEX_ROOT *ir;
+ INDEX_ENTRY *ie;
+ INDEX_ALLOCATION *ia;
+ int rc, ir_pos, bmp_buf_size, bmp_buf_pos, eo;
+ __u32 index_block_size, index_vcn_size;
+ __u8 index_block_size_bits, index_vcn_size_bits;
+
+ if (!dir_ni || !pos || !filldir) {
+ errno = EINVAL;
+ return -1;
+ }
+
+ vol = dir_ni->vol;
+
+ Dprintf("Entering for inode 0x%Lx, *pos 0x%Lx.\n",
+ (unsigned long long)dir_ni->mft_no, (long long)*pos);
+
+ /* Open the index allocation attribute. */
+ ia_na = ntfs_attr_open(dir_ni, AT_INDEX_ALLOCATION, I30, 4);
+ if (!ia_na) {
+ if (errno != ENOENT) {
+ Dprintf("Failed to open index allocation attribute. "
+ "Directory inode 0x%Lx is corrupt or "
+ "bug: %s\n",
+ (unsigned long long)dir_ni->mft_no,
+ strerror(errno));
+ return -1;
+ }
+ i_size = 0;
+ } else
+ i_size = ia_na->data_size;
+
+ rc = 0;
+
+ /* Are we at end of dir yet? */
+ if (*pos >= i_size + vol->mft_record_size)
+ goto done;
+
+ /* Emulate . and .. for all directories. */
+ if (!*pos) {
+ rc = filldir(dirent, dotdot, 1, FILE_NAME_POSIX, *pos,
+ MK_MREF(dir_ni->mft_no,
+ le16_to_cpu(dir_ni->mrec->sequence_number)),
+ NTFS_DT_DIR);
+ if (rc)
+ goto done;
+ ++*pos;
+ }
+ if (*pos == 1) {
+ MFT_REF parent_mref;
+
+ parent_mref = ntfs_get_parent_mft_ref(dir_ni);
+ if (parent_mref == -1) {
+ Dprintf("Parent directory not found: %s\n", errno);
+ goto dir_err_out;
+ }
+
+ rc = filldir(dirent, dotdot, 2, FILE_NAME_POSIX, *pos,
+ parent_mref, NTFS_DT_DIR);
+ if (rc)
+ goto done;
+ ++*pos;
+ }
+
+ ctx = ntfs_get_attr_search_ctx(dir_ni, NULL);
+ if (!ctx)
+ goto err_out;
+
+ /* Get the offset into the index root attribute. */
+ ir_pos = (int)*pos;
+ /* Find the index root attribute in the mft record. */
+ if (!ntfs_lookup_attr(AT_INDEX_ROOT, I30, 4, CASE_SENSITIVE, 0, NULL,
+ 0, ctx)) {
+ Dprintf("Index root attribute missing in directory inode "
+ "0x%Lx.\n", (unsigned long long)dir_ni->mft_no);
+ goto dir_err_out;
+ }
+ /* Get to the index root value. */
+ ir = (INDEX_ROOT*)((__u8*)ctx->attr +
+ le16_to_cpu(ctx->attr->value_offset));
+
+ /* Determine the size of a vcn in the directory index. */
+ index_block_size = le32_to_cpu(ir->index_block_size);
+ if (index_block_size < NTFS_SECTOR_SIZE ||
+ index_block_size & (index_block_size - 1)) {
+ Dprintf("Index block size %u is invalid.\n", index_block_size);
+ goto dir_err_out;
+ }
+ index_block_size_bits = ffs(index_block_size) - 1;
+ if (vol->cluster_size <= index_block_size) {
+ index_vcn_size = vol->cluster_size;
+ index_vcn_size_bits = vol->cluster_size_bits;
+ } else {
+ index_vcn_size = vol->sector_size;
+ index_vcn_size_bits = vol->sector_size_bits;
+ }
+
+ /* Are we jumping straight into the index allocation attribute? */
+ if (*pos >= vol->mft_record_size) {
+ ntfs_put_attr_search_ctx(ctx);
+ ctx = NULL;
+ goto skip_index_root;
+ }
+
+ index_end = (__u8*)&ir->index + le32_to_cpu(ir->index.index_length);
+ /* The first index entry. */
+ ie = (INDEX_ENTRY*)((__u8*)&ir->index +
+ le32_to_cpu(ir->index.entries_offset));
+ /*
+ * Loop until we exceed valid memory (corruption case) or until we
+ * reach the last entry or until filldir tells us it has had enough
+ * or signals an error (both covered by the rc test).
+ */
+ for (;; ie = (INDEX_ENTRY*)((__u8*)ie + le16_to_cpu(ie->length))) {
+ Dprintf("In index root, offset 0x%x.\n", (__u8*)ie - (__u8*)ir);
+ /* Bounds checks. */
+ if ((__u8*)ie < (__u8*)ctx->mrec || (__u8*)ie +
+ sizeof(INDEX_ENTRY_HEADER) > index_end ||
+ (__u8*)ie + le16_to_cpu(ie->key_length) >
+ index_end)
+ goto dir_err_out;
+ /* The last entry cannot contain a name. */
+ if (ie->flags & INDEX_ENTRY_END)
+ break;
+ /* Skip index root entry if continuing previous readdir. */
+ if (ir_pos > (__u8*)ie - (__u8*)ir)
+ continue;
+ /*
+ * Submit the directory entry to ntfs_filldir(), which will
+ * invoke the filldir() callback as appropriate.
+ */
+ rc = ntfs_filldir(dir_ni, pos, index_vcn_size_bits,
+ INDEX_TYPE_ROOT, ir, ie, dirent, filldir);
+ if (rc) {
+ ntfs_put_attr_search_ctx(ctx);
+ ctx = NULL;
+ goto done;
+ }
+ }
+ ntfs_put_attr_search_ctx(ctx);
+ ctx = NULL;
+
+ /* If there is no index allocation attribute we are finished. */
+ if (!ia_na)
+ goto EOD;
+
+ /* Advance *pos to the beginning of the index allocation. */
+ *pos = vol->mft_record_size;
+
+skip_index_root:
+
+ if (!ia_na)
+ goto done;
+
+ /* Allocate a buffer for the current index block. */
+ ia = (INDEX_ALLOCATION*)malloc(index_block_size);
+ if (!ia) {
+ Dperror("Failed to allocate buffer for index block");
+ goto err_out;
+ }
+
+ bmp_na = ntfs_attr_open(dir_ni, AT_BITMAP, I30, 4);
+ if (!bmp_na) {
+ Dperror("Failed to open index bitmap attribute");
+ goto dir_err_out;
+ }
+
+ /* Get the offset into the index allocation attribute. */
+ ia_pos = *pos - vol->mft_record_size;
+
+ bmp_pos = ia_pos >> index_block_size_bits;
+ if (bmp_pos >> 3 >= bmp_na->data_size) {
+ Dputs("Current index position exceeds index bitmap size.");
+ goto dir_err_out;
+ }
+
+ bmp_buf_size = min(bmp_na->data_size - (bmp_pos >> 3), 4096);
+ bmp = (__u8*)malloc(bmp_buf_size);
+ if (!bmp) {
+ Dperror("Failed to allocate bitmap buffer");
+ goto err_out;
+ }
+
+ br = ntfs_attr_pread(bmp_na, bmp_pos >> 3, bmp_buf_size, bmp);
+ if (br != bmp_buf_size) {
+ if (br != -1)
+ errno = EIO;
+ Dperror("Failed to read from inde bitmap attribute");
+ goto err_out;
+ }
+
+ bmp_buf_pos = 0;
+ /* If the index block is not in use find the next one that is. */
+ while (!(bmp[bmp_buf_pos >> 3] & (1 << (bmp_buf_pos & 7)))) {
+find_next_index_buffer:
+ bmp_pos++;
+ bmp_buf_pos++;
+ /* If we have reached the end of the bitmap, we are done. */
+ if (bmp_pos >> 3 >= bmp_na->data_size)
+ goto EOD;
+ ia_pos = bmp_pos << index_block_size_bits;
+ if (bmp_buf_pos >> 3 < bmp_buf_size)
+ continue;
+ /* Read next chunk from the index bitmap. */
+ if ((bmp_pos >> 3) + bmp_buf_size > bmp_na->data_size)
+ bmp_buf_size = bmp_na->data_size - (bmp_pos >> 3);
+ br = ntfs_attr_pread(bmp_na, bmp_pos >> 3, bmp_buf_size, bmp);
+ if (br != bmp_buf_size) {
+ if (br != -1)
+ errno = EIO;
+ Dperror("Failed to read from inde bitmap attribute");
+ goto err_out;
+ }
+ }
+
+ Dprintf("Handling index block 0x%Lx.", (long long)bmp_pos);
+
+ /* Read the index block starting at bmp_pos. */
+ br = ntfs_attr_mst_pread(ia_na, bmp_pos << index_block_size_bits, 1,
+ index_block_size, ia);
+ if (br != 1) {
+ if (br != -1)
+ errno = EIO;
+ Dperror("Failed to read index block");
+ goto err_out;
+ }
+
+ ia_start = ia_pos & ~(__s64)(index_block_size - 1);
+ if (sle64_to_cpu(ia->index_block_vcn) != ia_start >>
+ index_vcn_size_bits) {
+ Dprintf("Actual VCN (0x%Lx) of index buffer is different from "
+ "expected VCN (0x%Lx) in inode 0x%Lx.\n",
+ (long long)sle64_to_cpu(ia->index_block_vcn),
+ (long long)ia_start >> index_vcn_size_bits,
+ (unsigned long long)dir_ni->mft_no);
+ goto dir_err_out;
+ }
+ if (le32_to_cpu(ia->index.allocated_size) + 0x18 != index_block_size) {
+ Dprintf("Index buffer (VCN 0x%Lx) of directory inode 0x%Lx "
+ "has a size (%u) differing from the directory "
+ "specified size (%u).\n",
+ (long long)ia_start >> index_vcn_size_bits,
+ (unsigned long long)dir_ni->mft_no,
+ le32_to_cpu(ia->index.allocated_size) + 0x18,
+ index_block_size);
+ goto dir_err_out;
+ }
+ index_end = (__u8*)&ia->index + le32_to_cpu(ia->index.index_length);
+ if (index_end > (__u8*)ia + index_block_size) {
+ Dprintf("Size of index buffer (VCN 0x%Lx) of directory inode "
+ "0x%Lx exceeds maximum size.\n",
+ (long long)ia_start >> index_vcn_size_bits,
+ (unsigned long long)dir_ni->mft_no);
+ goto dir_err_out;
+ }
+ /* The first index entry. */
+ ie = (INDEX_ENTRY*)((__u8*)&ia->index +
+ le32_to_cpu(ia->index.entries_offset));
+ /*
+ * Loop until we exceed valid memory (corruption case) or until we
+ * reach the last entry or until ntfs_filldir tells us it has had
+ * enough or signals an error (both covered by the rc test).
+ */
+ for (;; ie = (INDEX_ENTRY*)((__u8*)ie + le16_to_cpu(ie->length))) {
+ Dprintf("In index allocation, offset 0x%Lx.\n",
+ (long long)ia_start + ((__u8*)ie - (__u8*)ia));
+ /* Bounds checks. */
+ if ((__u8*)ie < (__u8*)ia || (__u8*)ie +
+ sizeof(INDEX_ENTRY_HEADER) > index_end ||
+ (__u8*)ie + le16_to_cpu(ie->key_length) >
+ index_end) {
+ Dprintf("Index entry out of bounds in directory inode "
+ "0x%Lx.\n",
+ (unsigned long long)dir_ni->mft_no);
+ goto dir_err_out;
+ }
+ /* The last entry cannot contain a name. */
+ if (ie->flags & INDEX_ENTRY_END)
+ break;
+ /* Skip index entry if continuing previous readdir. */
+ if (ia_pos - ia_start > (__u8*)ie - (__u8*)ia)
+ continue;
+ /*
+ * Submit the directory entry to ntfs_filldir(), which will
+ * invoke the filldir() callback as appropriate.
+ */
+ rc = ntfs_filldir(dir_ni, pos, index_vcn_size_bits,
+ INDEX_TYPE_ALLOCATION, ia, ie, dirent, filldir);
+ if (rc)
+ goto done;
+ }
+ goto find_next_index_buffer;
+
+
+
+EOD:
+ /* We are finished, set *pos to EOD. */
+ *pos = i_size + vol->mft_record_size;
+done:
+ if (bmp_na)
+ ntfs_attr_close(bmp_na);
+ ntfs_attr_close(ia_na);
+#ifdef DEBUG
+ if (!rc)
+ Dprintf("EOD, *pos 0x%Lx, returning 0.\n", (long long)*pos);
+ else
+ Dprintf("filldir returned %i, *pos 0x%Lx, returning 0.\n",
+ rc, (long long)*pos);
+#endif
+ return 0;
+dir_err_out:
+ errno = EIO;
+err_out:
+ eo = errno;
+ Dputs(__FUNCTION__ "() failed.");
+ if (ctx)
+ ntfs_put_attr_search_ctx(ctx);
+ if (bmp_na)
+ ntfs_attr_close(bmp_na);
+ ntfs_attr_close(ia_na);
+ errno = eo;
+ return -1;
}
Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/mft.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -U2 -r1.27 -r1.28
--- mft.c 5 Jun 2002 20:32:53 -0000 1.27
+++ mft.c 8 Jun 2002 14:12:01 -0000 1.28
@@ -224,5 +224,5 @@
return 0;
file_corrupt:
- Dputs("read_file_record(): file is corrupt.");
+ Dputs("ntfs_read_file_record(): file is corrupt.");
err = EIO;
read_failed:
|
|
From: Anton A. <an...@us...> - 2002-06-08 14:12:10
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/include In directory usw-pr-cvs1:/tmp/cvs-serv27454/include Modified Files: dir.h layout.h Log Message: ntfs_readdir() has arrived. Index: dir.h =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/dir.h,v retrieving revision 1.2 retrieving revision 1.3 diff -U2 -r1.2 -r1.3 --- dir.h 6 Jun 2002 20:47:29 -0000 1.2 +++ dir.h 8 Jun 2002 14:12:01 -0000 1.3 @@ -25,4 +25,6 @@ #define NTFS_DIR_H +#include "types.h" + /* The little endian Unicode string $I30 as a global constant. */ extern uchar_t I30[5]; @@ -30,4 +32,30 @@ extern __u64 ntfs_lookup_inode_by_name(ntfs_inode *dir_ni, const uchar_t *uname, const int uname_len); + +/* + * File types (adapted from include <linux/fs.h>) + */ +#define NTFS_DT_UNKNOWN 0 +#define NTFS_DT_FIFO 1 +#define NTFS_DT_CHR 2 +#define NTFS_DT_DIR 4 +#define NTFS_DT_BLK 6 +#define NTFS_DT_REG 8 +#define NTFS_DT_LNK 10 +#define NTFS_DT_SOCK 12 +#define NTFS_DT_WHT 14 + +/* + * This is the "ntfs_filldir" function type, used by ntfs_readdir() to let + * the caller specify what kind of dirent layout it wants to have. + * This allows the caller to read directories into their application or + * to have different dirent layouts depending on the binary type. + */ +typedef int (*ntfs_filldir_t)(void *dirent, const uchar_t *name, + const int name_len, const int name_type, const __s64 pos, + const MFT_REF mref, const unsigned dt_type); + +extern int ntfs_readdir(ntfs_inode *dir_ni, __s64 *pos, + void *dirent, ntfs_filldir_t filldir); #endif /* defined NTFS_DIR_H */ Index: layout.h =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/layout.h,v retrieving revision 1.20 retrieving revision 1.21 diff -U2 -r1.20 -r1.21 --- layout.h 5 Jun 2002 00:29:18 -0000 1.20 +++ layout.h 8 Jun 2002 14:12:01 -0000 1.21 @@ -286,4 +286,7 @@ typedef __u64 MFT_REF; +#define MK_MREF(m, s) ((MFT_REF)(((MFT_REF)(s) << 48) | \ + ((MFT_REF)(m) & MFT_REF_MASK_CPU))) + #define MREF(x) ((__u64)((x) & MFT_REF_MASK_CPU)) #define MSEQNO(x) ((__u16)(((x) >> 48) & 0xffff)) |
|
From: Anton A. <an...@us...> - 2002-06-07 01:16:24
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv12839/libntfs
Modified Files:
attrib.c volume.c
Log Message:
Updates
Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/attrib.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -U2 -r1.43 -r1.44
--- attrib.c 5 Jun 2002 20:32:53 -0000 1.43
+++ attrib.c 7 Jun 2002 01:16:20 -0000 1.44
@@ -390,6 +390,5 @@
*/
static __inline__ void __ntfs_attr_init(ntfs_attr *na, ntfs_inode *ni,
- const ATTR_TYPES type, uchar_t *name,
- const __u32 name_len)
+ const ATTR_TYPES type, uchar_t *name, const __u32 name_len)
{
na->rl = NULL;
Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/volume.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -U2 -r1.43 -r1.44
--- volume.c 2 Jun 2002 23:02:20 -0000 1.43
+++ volume.c 7 Jun 2002 01:16:20 -0000 1.44
@@ -375,5 +375,5 @@
ntfs_volume *vol;
NTFS_BOOT_SECTOR *bs = NULL;
- int eo, ro = rwflag & MS_RDONLY;
+ int eo;
#ifdef DEBUG
BOOL debug = 1;
@@ -392,6 +392,8 @@
if (!(bs = (NTFS_BOOT_SECTOR *)malloc(sizeof(NTFS_BOOT_SECTOR))))
goto error_exit;
+ if (rwflag & MS_RDONLY)
+ NVolSetReadOnly(vol);
Dprintf("Reading bootsector... ");
- if ((vol->fd = open(name, ro ? O_RDONLY: O_RDWR)) == -1) {
+ if ((vol->fd = open(name, NVolReadOnly(vol) ? O_RDONLY: O_RDWR)) < 0) {
Dputs(FAILED);
Dperror("Error opening partition file");
|
|
From: Anton A. <an...@us...> - 2002-06-07 01:16:24
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs In directory usw-pr-cvs1:/tmp/cvs-serv12839 Modified Files: TODO.libntfs Log Message: Updates Index: TODO.libntfs =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/TODO.libntfs,v retrieving revision 1.6 retrieving revision 1.7 diff -U2 -r1.6 -r1.7 --- TODO.libntfs 5 Jun 2002 20:32:53 -0000 1.6 +++ TODO.libntfs 7 Jun 2002 01:16:20 -0000 1.7 @@ -3,6 +3,4 @@ ***************** -- write/port index_lookup function (see mkntfs and ntfs tng driver) - - write/port index_list/readdir function (see ntfs tng driver) |
|
From: Anton A. <an...@us...> - 2002-06-06 20:48:02
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv13301
Modified Files:
ChangeLog
Log Message:
The beginning of the directory operations! Introduce dir.[hc] and ntfs_lookup_inode_by_name().
Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -U2 -r1.61 -r1.62
--- ChangeLog 5 Jun 2002 20:32:52 -0000 1.61
+++ ChangeLog 6 Jun 2002 20:47:28 -0000 1.62
@@ -103,4 +103,6 @@
ntfs_{read,write}_clusters().
- Change ntfsfix to take into account the automatic mft mirror updates.
+ - Add new API provided by new files dir.[ch]:
+ ntfs_lookup_inode_by_name().
12/03/2002 - 1.6.0 - More mkntfs options and cleanups.
|
|
From: Anton A. <an...@us...> - 2002-06-06 20:47:41
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv13301/libntfs
Modified Files:
bootsect.c dir.c
Log Message:
The beginning of the directory operations! Introduce dir.[hc] and ntfs_lookup_inode_by_name().
Index: bootsect.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/bootsect.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- bootsect.c 2 Jun 2002 23:02:20 -0000 1.10
+++ bootsect.c 6 Jun 2002 20:47:33 -0000 1.11
@@ -186,4 +186,8 @@
errno = EINVAL;
+ vol->sector_size = le16_to_cpu(bs->bpb.bytes_per_sector);
+ vol->sector_size_bits = ffs(vol->sector_size) - 1;
+ Dprintf("SectorSize = 0x%x\n", vol->sector_size);
+ Dprintf("SectorSizeBits = %u\n", vol->sector_size_bits);
/*
* The bounds checks on mft_lcn and mft_mirr_lcn (i.e. them being
@@ -214,6 +218,5 @@
return -1;
}
- vol->cluster_size = sectors_per_cluster *
- le16_to_cpu(bs->bpb.bytes_per_sector);
+ vol->cluster_size = sectors_per_cluster * vol->sector_size;
if (vol->cluster_size & (vol->cluster_size - 1)) {
Dprintf("Error: %s is not a valid NTFS partition! "
Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/dir.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- dir.c 6 Jun 2002 15:41:30 -0000 1.1
+++ dir.c 6 Jun 2002 20:47:33 -0000 1.2
@@ -22,5 +22,7 @@
*/
+#include <stdlib.h>
#include <errno.h>
+#include <string.h>
#include "types.h"
@@ -29,9 +31,10 @@
#include "inode.h"
#include "dir.h"
+#include "volume.h"
/**
* The little endian Unicode string $I30 as a global constant.
*/
-const uchar_t I30[5] = { const_cpu_to_le16('$'), const_cpu_to_le16('I'),
+uchar_t I30[5] = { const_cpu_to_le16('$'), const_cpu_to_le16('I'),
const_cpu_to_le16('3'), const_cpu_to_le16('0'),
const_cpu_to_le16(0) };
@@ -42,5 +45,4 @@
* @uname: Unicode name for which to search in the directory
* @uname_len: length of the name @uname in Unicode characters
- * @res: return the found file name if necessary (see below)
*
* Look for an inode with name @uname in the directory with inode @dir_ni.
@@ -50,9 +52,6 @@
* is a 64-bit number containing the sequence number.
*
- * On error, a negative value is returned corresponding to the error code. In
- * particular if the inode is not found -ENOENT is returned. Note that you
- * can't just check the return value for being negative, you have to check the
- * inode number for being negative which you can extract using MREC(return
- * value).
+ * On error, return -1 with errno set to the error code. If the inode is is not
+ * found errno is ENOENT.
*
* Note, @uname_len does not include the (optional) terminating NULL character.
@@ -61,16 +60,395 @@
* insensitive match at the same time. If we find a case insensitive match, we
* save that for the case that we don't find an exact match, where we return
- * the case insensitive match and setup @res (which we allocate!) with the mft
- * reference, the file name type, length and with a copy of the little endian
- * Unicode file name itself. If we match a file name which is in the DOS name
- * space, we only return the mft reference and file name type in @res.
- * ntfs_lookup() then uses this to find the long file name in the inode itself.
- * This is to avoid polluting the dcache with short file names. We want them to
- * work but we don't care for how quickly one can access them. This also fixes
- * the dcache aliasing issues.
+ * the mft reference of the case insensitive match.
+ *
+ * If the volume is mounted with the case sensitive flag set, then we only
+ * allow exact matches.
*/
-u64 ntfs_lookup_inode_by_name(ntfs_inode *dir_ni, const uchar_t *uname,
+__u64 ntfs_lookup_inode_by_name(ntfs_inode *dir_ni, const uchar_t *uname,
const int uname_len)
{
+ VCN vcn;
+ __u64 mref = 0;
+ __s64 br;
+ ntfs_volume *vol = dir_ni->vol;
+ ntfs_attr_search_ctx *ctx;
+ INDEX_ROOT *ir;
+ INDEX_ENTRY *ie;
+ INDEX_ALLOCATION *ia;
+ __u8 *index_end;
+ ntfs_attr *ia_na;
+ int eo, rc;
+ __u32 index_block_size, index_vcn_size;
+ __u8 index_vcn_size_bits;
+
+ if (!dir_ni || !dir_ni->mrec || !uname || uname_len <= 0) {
+ errno = EINVAL;
+ return -1;
+ }
+
+ ctx = ntfs_get_attr_search_ctx(dir_ni, NULL);
+ if (!ctx)
+ return -1;
+
+ /* Find the index root attribute in the mft record. */
+ if (!ntfs_lookup_attr(AT_INDEX_ROOT, I30, 4, CASE_SENSITIVE, 0, NULL,
+ 0, ctx)) {
+ Dprintf("Index root attribute missing in directory inode "
+ "0x%Lx: %s\n",
+ (unsigned long long)dir_ni->mft_no,
+ strerror(errno));
+ goto put_err_out;
+ }
+ /* Get to the index root value (it's been verified in read_inode). */
+ ir = (INDEX_ROOT*)((__u8*)ctx->attr +
+ le16_to_cpu(ctx->attr->value_offset));
+ index_block_size = le32_to_cpu(ir->index_block_size);
+ if (index_block_size < NTFS_SECTOR_SIZE ||
+ index_block_size & (index_block_size - 1)) {
+ Dprintf("Index block size %u is invalid.\n", index_block_size);
+ goto put_err_out;
+ }
+ index_end = (__u8*)&ir->index + le32_to_cpu(ir->index.index_length);
+ /* The first index entry. */
+ ie = (INDEX_ENTRY*)((__u8*)&ir->index +
+ le32_to_cpu(ir->index.entries_offset));
+ /*
+ * Loop until we exceed valid memory (corruption case) or until we
+ * reach the last entry.
+ */
+ for (;; ie = (INDEX_ENTRY*)((__u8*)ie + le16_to_cpu(ie->length))) {
+ /* Bounds checks. */
+ if ((__u8*)ie < (__u8*)ctx->mrec || (__u8*)ie +
+ sizeof(INDEX_ENTRY_HEADER) > index_end ||
+ (__u8*)ie + le16_to_cpu(ie->key_length) >
+ index_end)
+ goto put_err_out;
+ /*
+ * The last entry cannot contain a name. It can however contain
+ * a pointer to a child node in the B+tree so we just break out.
+ */
+ if (ie->flags & INDEX_ENTRY_END)
+ break;
+ /*
+ * We perform a case sensitive comparison and if that matches
+ * we are done and return the mft reference of the inode (i.e.
+ * the inode number together with the sequence number for
+ * consistency checking). We convert it to cpu format before
+ * returning.
+ */
+ if (ntfs_are_names_equal(uname, uname_len,
+ (uchar_t*)&ie->key.file_name.file_name,
+ ie->key.file_name.file_name_length,
+ CASE_SENSITIVE, vol->upcase, vol->upcase_len)) {
+found_it:
+ /*
+ * We have a perfect match, so we don't need to care
+ * about having matched imperfectly before.
+ */
+ mref = le64_to_cpu(ie->indexed_file);
+ ntfs_put_attr_search_ctx(ctx);
+ return mref;
+ }
+ /*
+ * For a case insensitive mount, we also perform a case
+ * insensitive comparison (provided the file name is not in the
+ * POSIX namespace). If the comparison matches, we cache the
+ * mft reference in mref.
+ */
+ if (!NVolCaseSensitive(vol) &&
+ ie->key.file_name.file_name_type &&
+ ntfs_are_names_equal(uname, uname_len,
+ (uchar_t*)&ie->key.file_name.file_name,
+ ie->key.file_name.file_name_length,
+ IGNORE_CASE, vol->upcase, vol->upcase_len)) {
+ /* Only one case insensitive matching name allowed. */
+ if (mref) {
+ Dputs("Found already cached mft reference in "
+ "phase 1. Please run chkdsk "
+ "and if that doesn't find any "
+ "errors please report you saw "
+ "this message to "
+ "lin...@li....");
+ goto put_err_out;
+ }
+ mref = le64_to_cpu(ie->indexed_file);
+ }
+ /*
+ * Not a perfect match, need to do full blown collation so we
+ * know which way in the B+tree we have to go.
+ */
+ rc = ntfs_collate_names(uname, uname_len,
+ (uchar_t*)&ie->key.file_name.file_name,
+ ie->key.file_name.file_name_length, 1,
+ IGNORE_CASE, vol->upcase, vol->upcase_len);
+ /*
+ * If uname collates before the name of the current entry, there
+ * is definitely no such name in this index but we might need to
+ * descend into the B+tree so we just break out of the loop.
+ */
+ if (rc == -1)
+ break;
+ /* The names are not equal, continue the search. */
+ if (rc)
+ continue;
+ /*
+ * Names match with case insensitive comparison, now try the
+ * case sensitive comparison, which is required for proper
+ * collation.
+ */
+ rc = ntfs_collate_names(uname, uname_len,
+ (uchar_t*)&ie->key.file_name.file_name,
+ ie->key.file_name.file_name_length, 1,
+ CASE_SENSITIVE, vol->upcase, vol->upcase_len);
+ if (rc == -1)
+ break;
+ if (rc)
+ continue;
+ /*
+ * Perfect match, this will never happen as the
+ * ntfs_are_names_equal() call will have gotten a match but we
+ * still treat it correctly.
+ */
+ goto found_it;
+ }
+ /*
+ * We have finished with this index without success. Check for the
+ * presence of a child node and if not present return error code
+ * ENOENT, unless we have got the mft reference of a matching name
+ * cached in mref in which case return mref.
+ */
+ if (!(ie->flags & INDEX_ENTRY_NODE)) {
+ ntfs_put_attr_search_ctx(ctx);
+ if (mref)
+ return mref;
+ Dputs("Entry not found.");
+ errno = ENOENT;
+ return -1;
+ } /* Child node present, descend into it. */
+
+ /* Open the index allocation attribute. */
+ ia_na = ntfs_attr_open(dir_ni, AT_INDEX_ALLOCATION, I30, 4);
+ if (!ia_na) {
+ Dprintf("Failed to open index allocation attribute. Directory "
+ "inode 0x%Lx is corrupt or driver bug: %s\n",
+ (unsigned long long)dir_ni->mft_no,
+ strerror(errno));
+ goto put_err_out;
+ }
+
+ /* Allocate a buffer for the current index block. */
+ ia = (INDEX_ALLOCATION*)malloc(index_block_size);
+ if (!ia) {
+ Dperror("Failed to allocate buffer for index block");
+
+ goto put_err_out;
+ }
+
+ /* Determine the size of a vcn in the directory index. */
+ if (vol->cluster_size <= index_block_size) {
+ index_vcn_size = vol->cluster_size;
+ index_vcn_size_bits = vol->cluster_size_bits;
+ } else {
+ index_vcn_size = vol->sector_size;
+ index_vcn_size_bits = vol->sector_size_bits;
+ }
+
+ /* Get the starting vcn of the index_block holding the child node. */
+ vcn = sle64_to_cpup((__u8*)ie + le16_to_cpu(ie->length) - 8);
+
+descend_into_child_node:
+
+ /* Read the index block starting at vcn. */
+ br = ntfs_attr_mst_pread(ia_na, vcn << index_vcn_size_bits, 1,
+ index_block_size, ia);
+ if (br != 1) {
+ if (br != -1)
+ errno = EIO;
+ Dprintf("Failed to read vcn 0x%Lx: %s\n", vcn, strerror(errno));
+ goto close_err_out;
+ }
+
+ if (sle64_to_cpu(ia->index_block_vcn) != vcn) {
+ Dprintf("Actual VCN (0x%Lx) of index buffer is different from "
+ "expected VCN (0x%Lx).\n",
+ (long long)sle64_to_cpu(ia->index_block_vcn),
+ (long long)vcn);
+ errno = EIO;
+ goto close_err_out;
+ }
+ if (le32_to_cpu(ia->index.allocated_size) + 0x18 != index_block_size) {
+ Dprintf("Index buffer (VCN 0x%Lx) of directory inode 0x%Lx "
+ "has a size (%u) differing from the directory "
+ "specified size (%u). Directory inode is "
+ "corrupt or driver bug.\n", (long long)vcn,
+ (unsigned long long)dir_ni->mft_no,
+ le32_to_cpu(ia->index.allocated_size) + 0x18,
+ index_block_size);
+ errno = EIO;
+ goto close_err_out;
+ }
+ index_end = (__u8*)&ia->index + le32_to_cpu(ia->index.index_length);
+ if (index_end > (__u8*)ia + index_block_size) {
+ Dprintf("Size of index buffer (VCN 0x%Lx) of directory inode "
+ "0x%Lx exceeds maximum size.\n", (long long)vcn,
+ (unsigned long long)dir_ni->mft_no);
+ errno = EIO;
+ goto close_err_out;
+ }
+
+ /* The first index entry. */
+ ie = (INDEX_ENTRY*)((__u8*)&ia->index +
+ le32_to_cpu(ia->index.entries_offset));
+ /*
+ * Iterate similar to above big loop but applied to index buffer, thus
+ * loop until we exceed valid memory (corruption case) or until we
+ * reach the last entry.
+ */
+ for (;; ie = (INDEX_ENTRY*)((__u8*)ie + le16_to_cpu(ie->length))) {
+ /* Bounds check. */
+ if ((__u8*)ie < (__u8*)ia || (__u8*)ie +
+ sizeof(INDEX_ENTRY_HEADER) > index_end ||
+ (__u8*)ie + le16_to_cpu(ie->key_length) >
+ index_end) {
+ Dprintf("Index entry out of bounds in directory inode "
+ "0x%Lx.\n",
+ (unsigned long long)dir_ni->mft_no);
+ errno = EIO;
+ goto close_err_out;
+ }
+ /*
+ * The last entry cannot contain a name. It can however contain
+ * a pointer to a child node in the B+tree so we just break out.
+ */
+ if (ie->flags & INDEX_ENTRY_END)
+ break;
+ /*
+ * We perform a case sensitive comparison and if that matches
+ * we are done and return the mft reference of the inode (i.e.
+ * the inode number together with the sequence number for
+ * consistency checking). We convert it to cpu format before
+ * returning.
+ */
+ if (ntfs_are_names_equal(uname, uname_len,
+ (uchar_t*)&ie->key.file_name.file_name,
+ ie->key.file_name.file_name_length,
+ CASE_SENSITIVE, vol->upcase, vol->upcase_len)) {
+found_it2:
+ /*
+ * We have a perfect match, so we don't need to care
+ * about having matched imperfectly before.
+ */
+ mref = le64_to_cpu(ie->indexed_file);
+ ntfs_attr_close(ia_na);
+ ntfs_put_attr_search_ctx(ctx);
+ return mref;
+ }
+ /*
+ * For a case insensitive mount, we also perform a case
+ * insensitive comparison (provided the file name is not in the
+ * POSIX namespace). If the comparison matches, we cache the
+ * mft reference in mref.
+ */
+ if (!NVolCaseSensitive(vol) &&
+ ie->key.file_name.file_name_type &&
+ ntfs_are_names_equal(uname, uname_len,
+ (uchar_t*)&ie->key.file_name.file_name,
+ ie->key.file_name.file_name_length,
+ IGNORE_CASE, vol->upcase, vol->upcase_len)) {
+ /* Only one case insensitive matching name allowed. */
+ if (mref) {
+ Dputs("Found already cached mft reference in "
+ "phase 2. Please run chkdsk "
+ "and if that doesn't find any "
+ "errors please report you saw "
+ "this message to "
+ "lin...@li....");
+ goto close_err_out;
+ }
+ mref = le64_to_cpu(ie->indexed_file);
+ }
+ /*
+ * Not a perfect match, need to do full blown collation so we
+ * know which way in the B+tree we have to go.
+ */
+ rc = ntfs_collate_names(uname, uname_len,
+ (uchar_t*)&ie->key.file_name.file_name,
+ ie->key.file_name.file_name_length, 1,
+ IGNORE_CASE, vol->upcase, vol->upcase_len);
+ /*
+ * If uname collates before the name of the current entry, there
+ * is definitely no such name in this index but we might need to
+ * descend into the B+tree so we just break out of the loop.
+ */
+ if (rc == -1)
+ break;
+ /* The names are not equal, continue the search. */
+ if (rc)
+ continue;
+ /*
+ * Names match with case insensitive comparison, now try the
+ * case sensitive comparison, which is required for proper
+ * collation.
+ */
+ rc = ntfs_collate_names(uname, uname_len,
+ (uchar_t*)&ie->key.file_name.file_name,
+ ie->key.file_name.file_name_length, 1,
+ CASE_SENSITIVE, vol->upcase, vol->upcase_len);
+ if (rc == -1)
+ break;
+ if (rc)
+ continue;
+ /*
+ * Perfect match, this will never happen as the
+ * ntfs_are_names_equal() call will have gotten a match but we
+ * still treat it correctly.
+ */
+ goto found_it2;
+ }
+ /*
+ * We have finished with this index buffer without success. Check for
+ * the presence of a child node.
+ */
+ if (ie->flags & INDEX_ENTRY_NODE) {
+ if ((ia->index.flags & NODE_MASK) == LEAF_NODE) {
+ Dprintf("Index entry with child node found in a leaf "
+ "node in directory inode 0x%Lx.\n",
+ (unsigned long long)dir_ni->mft_no);
+ errno = EIO;
+ goto close_err_out;
+ }
+ /* Child node present, descend into it. */
+ vcn = sle64_to_cpup((__u8*)ie + le16_to_cpu(ie->length) - 8);
+ if (vcn >= 0)
+ goto descend_into_child_node;
+ Dprintf("Negative child node vcn in directory inode 0x%Lx.\n",
+ (unsigned long long)dir_ni->mft_no);
+ errno = EIO;
+ goto close_err_out;
+ }
+ ntfs_attr_close(ia_na);
+ ntfs_put_attr_search_ctx(ctx);
+ /*
+ * No child node present, return error code ENOENT, unless we have got
+ * the mft reference of a matching name cached in mref in which case
+ * return mref.
+ */
+ if (mref)
+ return mref;
+ Dputs("Entry not found.");
+ errno = ENOENT;
+ return -1;
+put_err_out:
+ eo = EIO;
+ Dputs("Corrupt directory. Aborting lookup.");
+eo_put_err_out:
+ ntfs_put_attr_search_ctx(ctx);
+ errno = eo;
+ return -1;
+close_err_out:
+ eo = errno;
+ free(ia);
+ ntfs_attr_close(ia_na);
+ goto eo_put_err_out;
}
|
|
From: Anton A. <an...@us...> - 2002-06-06 20:47:40
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv13301/include
Modified Files:
dir.h inode.h volume.h
Log Message:
The beginning of the directory operations! Introduce dir.[hc] and ntfs_lookup_inode_by_name().
Index: dir.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/dir.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- dir.h 6 Jun 2002 15:41:29 -0000 1.1
+++ dir.h 6 Jun 2002 20:47:29 -0000 1.2
@@ -26,8 +26,8 @@
/* The little endian Unicode string $I30 as a global constant. */
-extern const uchar_t I30[5];
+extern uchar_t I30[5];
-extern u64 ntfs_lookup_inode_by_name(ntfs_inode *dir_ni, const uchar_t *uname,
- const int uname_len);
+extern __u64 ntfs_lookup_inode_by_name(ntfs_inode *dir_ni,
+ const uchar_t *uname, const int uname_len);
#endif /* defined NTFS_DIR_H */
Index: inode.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/inode.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- inode.h 1 Jun 2002 00:41:45 -0000 1.8
+++ inode.h 6 Jun 2002 20:47:31 -0000 1.9
@@ -24,4 +24,5 @@
#include "types.h"
+#include "support.h"
/*
Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/volume.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -U2 -r1.23 -r1.24
--- volume.h 2 Jun 2002 23:02:20 -0000 1.23
+++ volume.h 6 Jun 2002 20:47:32 -0000 1.24
@@ -33,4 +33,5 @@
#include "types.h"
+#include "support.h"
/*
@@ -46,4 +47,24 @@
/*
+ * Defined bits for the state field in the ntfs_volume structure.
+ */
+typedef enum {
+ NV_ReadOnly, /* 1: Volume is read-only. */
+ NV_CaseSensitive, /* 1: Volume is mounted case-sensitive. */
+} ntfs_volume_state_bits;
+
+#define test_nvol_flag(nv, flag) test_bit(NV_##flag, (nv)->state)
+#define set_nvol_flag(nv, flag) set_bit(NV_##flag, (nv)->state)
+#define clear_nvol_flag(nv, flag) clear_bit(NV_##flag, (nv)->state)
+
+#define NVolReadOnly(nv) test_nvol_flag(nv, ReadOnly)
+#define NVolSetReadOnly(nv) set_nvol_flag(nv, ReadOnly)
+#define NVolClearReadOnly(nv) clear_nvol_flag(nv, ReadOnly)
+
+#define NVolCaseSensitive(nv) test_nvol_flag(nv, CaseSensitive)
+#define NVolSetCaseSensitive(nv) set_nvol_flag(nv, CaseSensitive)
+#define NVolClearCaseSensitive(nv) clear_nvol_flag(nv, CaseSensitive)
+
+/*
* ntfs_volume - structure describing an open volume in memory
*/
@@ -52,8 +73,12 @@
char *dev_name; /* Name of the device/file the volume is in. */
char *vol_name; /* Name of the volume. */
+ unsigned long state; /* NTFS specific flags describing this volume.
+ See ntfs_volume_state_bits above. */
__u8 major_ver; /* Ntfs major version of volume. */
__u8 minor_ver; /* Ntfs minor version of volume. */
__u16 flags; /* Bit array of VOLUME_* flags. */
+ __u16 sector_size; /* Byte size of a sector. */
+ __u8 sector_size_bits; /* Log(2) of the byte size of a sector. */
__u32 cluster_size; /* Byte size of a cluster. */
__u32 mft_record_size; /* Byte size of a mft record. */
|
|
From: Anton A. <an...@us...> - 2002-06-06 15:45:09
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/include In directory usw-pr-cvs1:/tmp/cvs-serv12814/include Modified Files: Makefile.am Makefile.in Log Message: And the headerfile too Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -U2 -r1.11 -r1.12 --- Makefile.am 22 Apr 2002 10:34:31 -0000 1.11 +++ Makefile.am 6 Jun 2002 15:45:06 -0000 1.12 @@ -13,4 +13,5 @@ bootsect.h \ debug.h \ + dir.h \ disk_io.h \ endians.h \ Index: Makefile.in =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/Makefile.in,v retrieving revision 1.18 retrieving revision 1.19 diff -U2 -r1.18 -r1.19 --- Makefile.in 25 Apr 2002 07:50:34 -0000 1.18 +++ Makefile.in 6 Jun 2002 15:45:06 -0000 1.19 @@ -98,4 +98,5 @@ bootsect.h \ debug.h \ + dir.h \ disk_io.h \ endians.h \ |
|
From: Anton A. <an...@us...> - 2002-06-06 15:44:02
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv12389/libntfs
Modified Files:
Makefile.am Makefile.in
Log Message:
Add dir template to make files
Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- Makefile.am 1 Jun 2002 00:41:45 -0000 1.14
+++ Makefile.am 6 Jun 2002 15:43:58 -0000 1.15
@@ -42,4 +42,5 @@
bootsect.c \
debug.c \
+ dir.c \
disk_io.c \
inode.c \
Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/Makefile.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -U2 -r1.20 -r1.21
--- Makefile.in 1 Jun 2002 00:41:45 -0000 1.20
+++ Makefile.in 6 Jun 2002 15:43:59 -0000 1.21
@@ -126,4 +126,5 @@
bootsect.c \
debug.c \
+ dir.c \
disk_io.c \
inode.c \
@@ -144,6 +145,6 @@
LIBS = @LIBS@
libntfs_la_LIBADD =
-libntfs_la_OBJECTS = attrib.lo bootsect.lo debug.lo disk_io.lo inode.lo \
-mft.lo mst.lo unistr.lo volume.lo
+libntfs_la_OBJECTS = attrib.lo bootsect.lo debug.lo dir.lo disk_io.lo \
+inode.lo mft.lo mst.lo unistr.lo volume.lo
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -157,5 +158,5 @@
TAR = gtar
GZIP_ENV = --best
-DEP_FILES = .deps/attrib.P .deps/bootsect.P .deps/debug.P \
+DEP_FILES = .deps/attrib.P .deps/bootsect.P .deps/debug.P .deps/dir.P \
.deps/disk_io.P .deps/inode.P .deps/mft.P .deps/mst.P .deps/unistr.P \
.deps/volume.P
|
