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...> - 2001-06-21 02:11:40
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/dynamic-disk In directory usw-pr-cvs1:/tmp/cvs-serv30544 Modified Files: Makefile.in README Added Files: AUTHORS ChangeLog Log Message: a few minor tweaks before the first release --- NEW FILE --- Linux kernel driver for LDM written by "Richard Russon" <nt...@fl...> --- NEW FILE --- 2000-06-21 Richard Russon <nt...@fl...> * Version 0.0.1 released * Need more test data Index: Makefile.in =================================================================== RCS file: /cvsroot/linux-ntfs/dynamic-disk/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -U2 -r1.2 -r1.3 --- Makefile.in 2001/06/16 22:54:54 1.2 +++ Makefile.in 2001/06/21 02:11:37 1.3 @@ -1,2 +1,4 @@ +# Copyright (C) 2001 Richard Russon + LINKS = docs src DRIVER = Makefile.driver Index: README =================================================================== RCS file: /cvsroot/linux-ntfs/dynamic-disk/README,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -U2 -r1.1.1.1 -r1.2 --- README 2001/06/16 20:29:36 1.1.1.1 +++ README 2001/06/21 02:11:37 1.2 @@ -1,6 +1,42 @@ -This utility SHOULD be read-only. -If I've made a mistake it could destroy your filesystem. +Logical Disk Manager (Dynamic Disk) Tool and Driver. - BEWARE +There are two packages included here. A userland tool +to dump the contents of a Window 2000 LDM Disk. Also +there's a Linux Filesystem driver. You need to know +what you're doing to use this. + +I've included a prebuilt copy of the tool in the .tar +If you want to build it yourself you need the kernel +header files, then: + + ./configure + make + +should do the trick. If it doesn't build without errors, +then you'll need to know your way around the kernel to +fix things. One problem is the inclusion of autoconf.h +If you built other partition types into your last kernel +then they'll probably show up a missing entries at link +time. + + +To run the tool, just point it at a disk, e.g. /dev/hda + + test/drive /dev/hda + +The output will be something like: + +Partition check: + hdb: hdb1 < hdb5 hdb6 hdb7 hdb8 > + + Device | Offset Bytes Sectors Mb | Size Bytes Sectors Mb + -------+--------------------------------+------------------------------- + hdb | 0 0 0 | 21159936 41328 20 + hdb1 | 20111360 39280 19 | 1048576 2048 1 + hdb5 | 32256 63 0 | 5242880 10240 5 + hdb6 | 5275136 10303 5 | 5242880 10240 5 + hdb7 | 10518016 20543 10 | 3145728 6144 3 + hdb8 | 13663744 26687 13 | 6291456 12288 6 + |
|
From: Richard R. <fl...@us...> - 2001-06-21 01:08:49
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv20391/linux/fs/partitions
Modified Files:
ldm.c ldm.h
Log Message:
first wave of tidyups
Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- ldm.c 2001/06/20 03:38:09 1.5
+++ ldm.c 2001/06/21 01:08:45 1.6
@@ -33,4 +33,6 @@
#include "msdos.h"
+/*----------------------------------------------------------------------------*/
+
/* Get a variable-width number
* The width is stored in a byte before the number */
@@ -53,4 +55,5 @@
static u8 * get_vstr (u8 *block)
{
+ /* XXX get rid of the static buffer in favour of a parameter? */
static u8 buffer[256];
u8 length = 0;
@@ -65,4 +68,6 @@
}
+/*----------------------------------------------------------------------------*/
+
/* We're looking for an MSDOS-style partition table with one entry in it:
* 0x42, which works like an extended partition. Detail will be placed in pt.*/
@@ -73,5 +78,4 @@
if (!buffer || !pt)
return 0;
-
if (*(u16*) (buffer + 0x01FE) != cpu_to_le16 (MSDOS_LABEL_MAGIC))
return 0;
@@ -103,5 +107,5 @@
ph->config_start = BE64 (buffer + 0x012B);
ph->config_size = BE64 (buffer + 0x0133);
- if (ph->config_size != 2048) /* 1 Mb */
+ if (ph->config_size != LDM_DB_SIZE) /* 1 MiB */
return 0;
@@ -169,8 +173,6 @@
if (!buffer || !vb)
return 0;
-
if (MAGIC_VBLK != BE32 (buffer))
return 0;
-
if (BE16 (buffer+14) == 0) /* record not in use */
return 0;
@@ -191,4 +193,6 @@
}
+/*----------------------------------------------------------------------------*/
+
/* validate the range, then put an entry into the kernel's partition table
* start and size are numbers of sectors */
@@ -207,11 +211,4 @@
}
-#if 0
-struct buffer_head * get_device_block (kdev_t dev, int sector)
-{
- return NULL;
-}
-#endif
-
/* find the primary private header, locate the LDM database,
* then create a partition to wrap it */
@@ -224,5 +221,5 @@
goto cdp_end;
- if (!(bh = bread (dev, OFF_PRIVHEAD1, 1024)))
+ if (!(bh = bread (dev, OFF_PRIVHEAD1, LDM_BLOCKSIZE)))
goto cdp_end;
@@ -237,29 +234,88 @@
return ret;
}
+
+/*----------------------------------------------------------------------------*/
-#ifdef XXX
-static inline struct buffer_head *
-get_partition_table_block(struct gendisk *hd, int minor, int blocknr)
+/* We already have one privhead from the beginning of the disk.
+ * Now we compare the two other copies for safety. */
+int validate_privheads (kdev_t dev, struct privhead *ph)
{
- kdev_t dev = MKDEV(hd->major, minor);
- return bread(dev, blocknr, get_ptable_blocksize(dev));
+ struct buffer_head *bh;
+ struct privhead ph2;
+ struct privhead ph3;
+ int ret = 0;
+
+ if (!(bh = bread (dev, OFF_PRIVHEAD2, LDM_BLOCKSIZE)))
+ goto vp_end;
+ if (!parse_privhead (bh->b_data, &ph2))
+ goto vp_free;
+ brelse (bh);
+
+ if (!(bh = bread (dev, OFF_PRIVHEAD3, LDM_BLOCKSIZE)))
+ goto vp_end;
+ if (!parse_privhead (bh->b_data + 0x0200, &ph3))
+ goto vp_free;
+
+ /* XXX Compare the privheads */
+
+ ret = 1;
+vp_free:
+ brelse (bh);
+vp_end:
+ return ret;
}
-#endif
+/* Find and compare the four Tables Of Contents */
+int validate_tocblocks (kdev_t devdb, struct tocblock *toc1)
+{
+ struct buffer_head *bh;
+ struct tocblock toc2;
+ struct tocblock toc3;
+ struct tocblock toc4;
+ int ret = 0;
+
+ if (!(bh = bread (devdb, OFF_TOCBLOCK1, LDM_BLOCKSIZE)))
+ goto vt_end;
+ if (!parse_tocblock (bh->b_data + 0x0200, toc1))
+ goto vt_free;
+ brelse (bh);
+
+ if (!(bh = bread (devdb, OFF_TOCBLOCK2, LDM_BLOCKSIZE)))
+ goto vt_end;
+ if (!parse_tocblock (bh->b_data, &toc2))
+ goto vt_free;
+ brelse (bh);
+
+ if (!(bh = bread (devdb, OFF_TOCBLOCK3, LDM_BLOCKSIZE)))
+ goto vt_end;
+ if (!parse_tocblock (bh->b_data + 0x0200, &toc3))
+ goto vt_free;
+ brelse (bh);
+
+ if (!(bh = bread (devdb, OFF_TOCBLOCK4, LDM_BLOCKSIZE)))
+ goto vt_end;
+ if (!parse_tocblock (bh->b_data, &toc4))
+ goto vt_free;
+
+ /* XXX When we know more about the TOCBLOCK we'll be able to check more */
+
+ ret = 1;
+vt_free:
+ brelse (bh);
+vt_end:
+ return ret;
+}
+
+/*----------------------------------------------------------------------------*/
+
/* 1 = match, 0 = no match, -1 = error */
int ldm_partition(struct gendisk *hd, kdev_t dev,
unsigned long first_sector, int first_part_minor)
{
- /* what about first_sector, first_part_minor? */
/* demote the "sector counts" to ints? -- limit of 1Tb */
struct buffer_head *bh;
struct ldmpart pt;
- struct privhead ph1;
- struct privhead ph2;
- struct privhead ph3;
- struct tocblock toc1;
- struct tocblock toc2;
- struct tocblock toc3;
- struct tocblock toc4;
+ struct privhead ph;
+ struct tocblock toc;
struct vmdb vm;
struct vblk vb;
@@ -270,14 +326,15 @@
int j;
int k;
- int minor = first_part_minor + LDM_FIRST_PART - 1;
+ int vpb;
+ int vbs;
+ int minor = MINOR(dev) + LDM_FIRST_PART;
kdev_t devdb;
- if (get_ptable_blocksize (dev) != 1024)
+ if (get_ptable_blocksize (dev) != LDM_BLOCKSIZE) /* 1024 bytes */
goto end;
-
if (get_hardsect_size (dev) != 512)
goto end;
- if (!(bh = bread (dev, 0, 1024)))
+ if (!(bh = bread (dev, 0, LDM_BLOCKSIZE)))
{
if (warn_no_part)
@@ -286,58 +343,27 @@
}
+ /* We don't actually use 'pt' yet, but it could be used to range check
+ * the other partitions. */
if (!parse_part_table (bh->b_data, &pt))
goto free;
brelse (bh);
-
ret = -1; /* Any problem after here are OUR problem */
- if (!create_db_partition (hd, dev, &ph1))
+ /* create a dedicated partition for our database */
+ if (!create_db_partition (hd, dev, &ph))
goto free;
- /* we now have a dedicated partition for our database */
devdb = MKDEV (MAJOR(dev), MINOR(dev)+LDM_DB_PART);
- if (!(bh = bread (devdb, OFF_PRIVHEAD2, 1024)))
+ if (!validate_privheads (devdb, &ph))
goto end;
- if (!parse_privhead (bh->b_data, &ph2))
- goto free;
- brelse (bh);
-
- if (!(bh = bread (devdb, OFF_PRIVHEAD3, 1024)))
+ if (!validate_tocblocks (devdb, &toc))
goto end;
- if (!parse_privhead (bh->b_data + 0x0200, &ph3))
- goto free;
- brelse (bh);
/*-----------------------------------------------------*/
- if (!(bh = bread (devdb, OFF_TOCBLOCK1, 1024)))
- goto end;
- if (!parse_tocblock (bh->b_data + 0x0200, &toc1))
- goto free;
- brelse (bh);
-
- if (!(bh = bread (devdb, OFF_TOCBLOCK2, 1024)))
- goto end;
- if (!parse_tocblock (bh->b_data, &toc2))
- goto free;
- brelse (bh);
- if (!(bh = bread (devdb, OFF_TOCBLOCK3, 1024)))
+ if (!(bh = bread (devdb, OFF_VMDB, LDM_BLOCKSIZE)))
goto end;
- if (!parse_tocblock (bh->b_data + 0x0200, &toc3))
- goto free;
- brelse (bh);
-
- if (!(bh = bread (devdb, OFF_TOCBLOCK4, 1024)))
- goto end;
- if (!parse_tocblock (bh->b_data, &toc4))
- goto free;
- brelse (bh);
-
- /*-----------------------------------------------------*/
-
- if (!(bh = bread (devdb, OFF_VMDB, 1024)))
- goto end;
if (!parse_vmdb (bh->b_data + 0x200, &vm))
goto end;
@@ -345,17 +371,21 @@
/*-----------------------------------------------------*/
+ vbs = vm.vblk_size;
+ vpb = LDM_BLOCKSIZE / vbs; /* VBLKs per LDM Block */
+
// take into account size and offset in vmdb
- j = vm.last_vblk_seq / 8;
+ j = vm.last_vblk_seq / vpb;
- // first find the correct disk
+ /* The database contains an entry for every partition on
+ * every disk. We must search for THIS disk. */
for (i = 0; i < j; i++)
{
brelse (bh);
- if (!(bh = bread (devdb, OFF_VBLK+i, 1024)))
+ if (!(bh = bread (devdb, OFF_VBLK+i, LDM_BLOCKSIZE)))
goto end;
data = bh->b_data;
- for (k = 0; k < 8; k++)
+ for (k = 0; k < vpb; k++)
{
int rel_objid;
@@ -365,6 +395,6 @@
u8 *block;
- block = data + 0x80*k;
- if (block[19] != VBLK_DISK)
+ block = data + vbs*k; /* 80 PARAMETER */
+ if (block[19] != VBLK_DISK) /* 19 const */
continue;
@@ -377,5 +407,5 @@
disk_id = get_vstr (block+0x18+rel_name);
- if (strcmp (disk_id, ph1.disk_id) == 0)
+ if (strcmp (disk_id, ph.disk_id) == 0)
{
dk.obj_id = get_vnum (block+0x18);
@@ -389,28 +419,30 @@
goto free;
found:
+ /* Finally we have the disk id, so we can decide which partitions
+ * belong to us. For each match create a partition entry. */
printk (" <");
for (i = 0; i < j; i++)
{
brelse (bh);
- if (!(bh = bread (devdb, OFF_VBLK+i, 1024)))
- goto end;
+ if (!(bh = bread (devdb, OFF_VBLK+i, LDM_BLOCKSIZE)))
+ goto end; /* no " >" */
data = bh->b_data;
- for (k = 0; k < 8; k++)
+ for (k = 0; k < vpb; k++)
{
u8 *block;
- block = data + 0x80*k;
- if (block[19] != VBLK_PART)
+ block = data + vbs*k;
+ if (block[19] != VBLK_PART) /*19 CONST */
continue;
- if (!parse_vblk (&ph1, data+(0x80*k), &vb))
- goto free;
+ if (!parse_vblk (&ph, data+(vbs*k), &vb))
+ goto free; /* no " >" */
if (dk.obj_id != vb.disk_id)
continue;
- if (create_partition (hd, minor, vb.start_sector + ph1.log_disk_start, vb.num_sectors))
+ if (create_partition (hd, minor, vb.start_sector + ph.log_disk_start, vb.num_sectors))
minor++;
}
@@ -424,54 +456,3 @@
return ret;
}
-
-#if 0
- minor = ((minor + hd->max_p) & ~(hd->max_p - 1)) - 1; /* round up */
- hd->part[minor].start_sect = ph1.config_start;
- hd->part[minor].nr_sects = ph1.config_size;
-
- //if (data)...?
- /* find the three copies of the private header
- * and verify that they are identical */
- //LDM_FIRST_PART
-
-#define isprint(a) ((a >=' ')&&(a <= '~'))
- if (0)
- {
- int offset = 0;
- printk ("%02x %02x %02x %02x %02x %02x %02x %02x - %c%c%c%c%c%c%c%c\n", data[offset+0], data[offset+1], data[offset+2], data[offset+3], data[offset+4], data[offset+5], data[offset+6], data[offset+7], isprint (data[offset+0]) ? data[offset+0] : '.', isprint (data[offset+1]) ? data[offset+1] : '.', isprint (data[offset+2]) ? data[offset+2] : '.', isprint (data[offset+3]) ? data[offset+3] : '.', isprint (data[offset+4]) ? data[offset+4] : '.', isprint (data[offset+5]) ? data[offset+5] : '.', isprint (data[offset+6]) ? data[offset+6] : '.', isprint (data[offset+7]) ? data[offset+7] : '.');
- offset += 128;
- printk ("\n");
- }
-
-void dump_sectors (kdev_t dev, int block, int size)
-{
- struct buffer_head *bh;
- u8 *data;
- int i, off = 0;
-
- if (!(bh = bread (dev, block, size)))
- return;
-
- printk ("block = %d, size = %d\n", block, size);
-
- data = bh->b_data;
-
- for (i = 0; i < size/512; i++, off+=512)
- {
- printk ("%d %02x %02x %02x %02x\n", i, data[off+0], data[off+1], data[off+2], data[off+3]);
- }
- printk ("\n");
-
- bforget (bh);
-}
-
- set_blocksize (dev, 512);
- if (!(bh = bread (dev, 1, 512)))
- return -1;
-
- if (bh->b_data[0] != 1)
- return 0;
- bforget (bh);
-
-#endif
Index: ldm.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- ldm.h 2001/06/20 02:55:42 1.3
+++ ldm.h 2001/06/21 01:08:45 1.4
@@ -59,4 +59,7 @@
#define OFF_VBLK 9
+#define LDM_BLOCKSIZE 1024
+#define LDM_DB_SIZE 2048 /* sectors == 1 MiB */
+
#define WIN2K_DYNAMIC_PARTITION 0x42 /* Formerly SFS */
|
|
From: Richard R. <fl...@us...> - 2001-06-21 01:08:27
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/dynamic-disk/linux/Documentation
In directory usw-pr-cvs1:/tmp/cvs-serv20135/linux/Documentation
Modified Files:
Configure.help
Log Message:
updated for 2.4.5-ac16
Index: Configure.help
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/Documentation/Configure.help,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- Configure.help 2001/06/17 13:46:16 1.2
+++ Configure.help 2001/06/21 01:08:04 1.3
@@ -3,5 +3,5 @@
# Steven Cole <mailto:ele...@me...>
#
-# Merged version 2.5: Current with 2.4.6-pre1 and 2.4.5-ac12.
+# Merged version 2.6: Current with 2.4.6-pre2 and 2.4.5-ac12.
#
# This version of the Linux kernel configuration help texts
@@ -958,4 +958,23 @@
SAY NO!
+# Linus tree only
+AMD Viper (7401/7409/7411) chipset support
+CONFIG_BLK_DEV_AMD7409
+ This driver ensures (U)DMA support for the AMD756/760 Viper chipset.
+
+ If you say Y here, you also need to say Y to "Use DMA by default
+ when available", above.
+ Please read the comments at the top of <file:drivers/ide/amd74xx.c>.
+
+ If unsure, say N.
+
+# Linus tree only
+AMD Viper ATA-66 Override support (WIP)
+CONFIG_AMD7409_OVERRIDE
+ This option auto-forces the ata66 flag.
+ This effect can be also invoked by calling "idex=ata66"
+ If unsure, say N.
+
+# AC tree only
AMD Viper (7401/7409/7411) chipset support
CONFIG_BLK_DEV_AMD74XX
@@ -968,4 +987,5 @@
If unsure, say N.
+# AC tree only
AMD Viper ATA-66 Override support (WIP)
CONFIG_AMD74XX_OVERRIDE
@@ -1114,4 +1134,8 @@
For FastTrak enable overiding BIOS.
+ServerWorks OSB4 chipset support
+CONFIG_BLK_DEV_OSB4
+ Support PIO/(U)DMA for the Open South Bridge PCI IDE controller chipset.
+
SiS5513 chipset support
CONFIG_BLK_DEV_SIS5513
@@ -12013,5 +12037,5 @@
module, say M here and read <file:Documentation/modules.txt>.
-USB KLSI KL5USB101-based Ethernet device support '
+USB KLSI KL5USB101-based Ethernet device support
CONFIG_USB_KAWETH
Say Y here if you want to use one of the following 10Mbps only
@@ -12029,5 +12053,5 @@
Linksys USB10T
Mobility USB-Ethernet Adapter
- NetGear EA-101
+ NetGear EA-101
Peracom Enet and Enet2
Portsmith Express Ethernet Adapter
@@ -12037,5 +12061,13 @@
This driver is likely to work with most 10Mbps only USB Ethernet
- adapters, including some "no brand" devices.
+ adapters, including some "no brand" devices. It does NOT work on
+ SmartBridges smartNIC or on Belkin F5U111 devices - you should use
+ the CATC NetMate driver for those. If you are not sure which one
+ you need, select both, and the correct one should be selected for
+ you.
+
+ This driver makes the adapter appear as a normal Ethernet interface,
+ typically on eth0, if it is the only ethernet device, or perhaps on
+ eth1, if you have a PCI or ISA ethernet card installed.
This code is also available as a module ( = code which can be
@@ -12044,4 +12076,22 @@
module, say M here and read <file:Documentation/modules.txt>.
+USB CATC NetMate-based Ethernet device support
+CONFIG_USB_CATC
+ Say Y if you want to use one of the following 10Mbps USB Ethernet
+ device based on the EL1210A chip. Supported devices are:
+ Belkin F5U111
+ CATC NetMate
+ CATC NetMate II
+ smartBridges smartNIC
+
+ This driver makes the adapter appear as a normal Ethernet interface,
+ typically on eth0, if it is the only ethernet device, or perhaps on
+ eth1, if you have a PCI or ISA ethernet card installed.
+
+ This code is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called catc.o. If you want to compile it as a
+ module, say M here and read <file:Documentation/modules.txt>.
+
USB Kodak DC-2xx Camera support
CONFIG_USB_DC2XX
@@ -15329,11 +15379,11 @@
which can be found in many (all ?) Sony Vaio laptops.
- If you have one of those laptops, read <file:Documentation/sonypi.txt>,
+ If you have one of those laptops, read Documentation/sonypi.txt,
and say Y or M here.
If you want to compile the driver as a module ( = code which can be
inserted in and removed from the running kernel whenever you want),
- say M here and read <file:Documentation/modules.txt>. The module will
- be called sonypi.o.
+ say M here and read <file:Documentation/modules.txt>. The module will be
+ called sonypi.o.
Intel Random Number Generator support
@@ -18175,5 +18225,5 @@
is at <http://www.angelfire.com/ca2/tech68k/sun3.html>.
-ESP SCSI driver
+Sun3x ESP SCSI driver
CONFIG_SUN3X_ESP
The ESP was an on-board SCSI controller used on Sun 3/80
@@ -20242,4 +20292,14 @@
here and read <file:Documentation/modules.txt>. The module will be called
smc-ircc.o.
+
+ALi M5123 FIR Controller Driver
+CONFIG_ALI_FIR
+ Say Y here if you want to build support for the ALi M5123 FIR
+ Controller. The ALi M5123 FIR Controller is embedded in ALi
+ M1543C, M1535, M1535D, M1535+, M1535D Sourth Bridge. This
+ driver supports SIR, MIR and FIR (4Mbps) speeds.
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. The module will be called ali-ircc.o.
Serial dongle support
|
|
From: Richard R. <fl...@us...> - 2001-06-20 03:38:12
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/dynamic-disk/test
In directory usw-pr-cvs1:/tmp/cvs-serv31000/test
Modified Files:
Makefile.in drive.c
Log Message:
fixed test prog to mimic the kernel correctly
Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- Makefile.in 2001/06/19 11:00:42 1.3
+++ Makefile.in 2001/06/20 03:38:10 1.4
@@ -3,5 +3,5 @@
SRC = drive.c
OBJ = drive.o
-DEP = ../partitions.o
+DEP = ../linux/fs/partitions/partitions.o
OUT = drive
Index: drive.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/drive.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- drive.c 2001/06/19 02:40:50 1.4
+++ drive.c 2001/06/20 03:38:10 1.5
@@ -83,8 +83,8 @@
long long offset;
- minor = dev & 255;
+ minor = MINOR (dev);
offset = hd[minor].start_sect;
- offset += block;
offset <<= 9;
+ offset += (block * size);
bh = malloc (sizeof (*bh));
@@ -97,5 +97,5 @@
if (lseek (device, offset, SEEK_SET) < 0)
{
- printf ("lseek to %lld failed\n", offset);
+ printf ("lseek to %lld failed\n", offset);
free (bh);
bh = NULL;
|
|
From: Richard R. <fl...@us...> - 2001-06-20 03:38:12
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/dynamic-disk In directory usw-pr-cvs1:/tmp/cvs-serv31000 Modified Files: Makefile.driver.in Log Message: fixed test prog to mimic the kernel correctly Index: Makefile.driver.in =================================================================== RCS file: /cvsroot/linux-ntfs/dynamic-disk/Makefile.driver.in,v retrieving revision 1.2 retrieving revision 1.3 diff -U2 -r1.2 -r1.3 --- Makefile.driver.in 2001/06/18 02:53:18 1.2 +++ Makefile.driver.in 2001/06/20 03:38:09 1.3 @@ -7,5 +7,5 @@ OBJ = $(SRC:.c=.o) -OUT = partitions.o +OUT = $(SRCDIR)/partitions.o CC = gcc @@ -35,18 +35,15 @@ CFLAGS += -I/usr/src/linux/fs/partitions -all: $(SRC) $(HDR) $(SRCDIR)/$(OUT) $(OUT) +all: $(SRC) $(HDR) $(OUT) -$(SRCDIR)/$(OUT): $(OBJ) - $(RM) $(SRCDIR)/$(OUT) - $(LD) $(LFLAGS) -o $(SRCDIR)/$(OUT) $(OBJ) +$(OUT): $(OBJ) + $(RM) $(OUT) + $(LD) $(LFLAGS) -o $(OUT) $(OBJ) -$(OUT): $(SRCDIR)/$(OUT) - $(CP) $(SRCDIR)/$(OUT) $(OUT) - .c.o: $(CC) $(CFLAGS) -c $< -o $@ clean: - $(RM) $(OUT) $(OBJ) $(SRCDIR)/$(OUT) + $(RM) $(OUT) $(OBJ) distclean: clean |
|
From: Richard R. <fl...@us...> - 2001-06-20 03:38:12
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions In directory usw-pr-cvs1:/tmp/cvs-serv31000/linux/fs/partitions Modified Files: ldm.c Log Message: fixed test prog to mimic the kernel correctly Index: ldm.c =================================================================== RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v retrieving revision 1.4 retrieving revision 1.5 diff -U2 -r1.4 -r1.5 --- ldm.c 2001/06/20 02:55:42 1.4 +++ ldm.c 2001/06/20 03:38:09 1.5 @@ -270,5 +270,5 @@ int j; int k; - int minor = first_part_minor + LDM_FIRST_PART; + int minor = first_part_minor + LDM_FIRST_PART - 1; kdev_t devdb; @@ -301,5 +301,5 @@ if (!(bh = bread (devdb, OFF_PRIVHEAD2, 1024))) goto end; - if (!parse_privhead (data = bh->b_data, &ph2)) + if (!parse_privhead (bh->b_data, &ph2)) goto free; brelse (bh); @@ -307,5 +307,5 @@ if (!(bh = bread (devdb, OFF_PRIVHEAD3, 1024))) goto end; - if (!parse_privhead (data = bh->b_data + 0x0200, &ph3)) + if (!parse_privhead (bh->b_data + 0x0200, &ph3)) goto free; brelse (bh); @@ -314,5 +314,5 @@ if (!(bh = bread (devdb, OFF_TOCBLOCK1, 1024))) goto end; - if (!parse_tocblock (data = bh->b_data + 0x0200, &toc1)) + if (!parse_tocblock (bh->b_data + 0x0200, &toc1)) goto free; brelse (bh); @@ -320,5 +320,5 @@ if (!(bh = bread (devdb, OFF_TOCBLOCK2, 1024))) goto end; - if (!parse_tocblock (data = bh->b_data, &toc2)) + if (!parse_tocblock (bh->b_data, &toc2)) goto free; brelse (bh); @@ -326,5 +326,5 @@ if (!(bh = bread (devdb, OFF_TOCBLOCK3, 1024))) goto end; - if (!parse_tocblock (data = bh->b_data + 0x0200, &toc3)) + if (!parse_tocblock (bh->b_data + 0x0200, &toc3)) goto free; brelse (bh); @@ -332,5 +332,5 @@ if (!(bh = bread (devdb, OFF_TOCBLOCK4, 1024))) goto end; - if (!parse_tocblock (data = bh->b_data, &toc4)) + if (!parse_tocblock (bh->b_data, &toc4)) goto free; brelse (bh); @@ -340,5 +340,5 @@ if (!(bh = bread (devdb, OFF_VMDB, 1024))) goto end; - if (!parse_vmdb (data = bh->b_data + 0x200, &vm)) + if (!parse_vmdb (bh->b_data + 0x200, &vm)) goto end; |
|
From: Richard R. <fl...@us...> - 2001-06-20 02:55:45
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv19705/linux/fs/partitions
Modified Files:
ldm.c ldm.h
Log Message:
it works, it works, it works! the kernel now supports dynamic disks!
Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- ldm.c 2001/06/18 02:53:19 1.3
+++ ldm.c 2001/06/20 02:55:42 1.4
@@ -101,9 +101,12 @@
return 0;
- ph->log_disk_start = BE64 (buffer + 0x011B);
- ph->log_disk_size = BE64 (buffer + 0x0123);
ph->config_start = BE64 (buffer + 0x012B);
ph->config_size = BE64 (buffer + 0x0133);
+ if (ph->config_size != 2048) /* 1 Mb */
+ return 0;
+ ph->log_disk_start = BE64 (buffer + 0x011B);
+ ph->log_disk_size = BE64 (buffer + 0x0123);
+
memcpy (ph->disk_id, buffer + 0x0030, 64);
@@ -115,8 +118,6 @@
if (!buffer || !toc)
return 0;
-
if (MAGIC_TOCBLOCK != BE64 (buffer))
return 0;
-
return 1;
}
@@ -126,5 +127,4 @@
if (!buffer || !vm)
return 0;
-
if (MAGIC_VMDB != BE32 (buffer))
return 0;
@@ -191,20 +191,66 @@
}
-/* find the three copies of the private header
- * and verify that they are identical */
-int get_privhead (struct privhead *ph)
+/* validate the range, then put an entry into the kernel's partition table
+ * start and size are numbers of sectors */
+int create_partition (struct gendisk *hd, int minor, int start, int size)
{
- return 0;
+ int disk_minor;
+ if (!hd || !hd->part)
+ return 0;
+
+ disk_minor = (minor >> hd->minor_shift) << hd->minor_shift;
+ if ((start < 1) || ((start + size) > hd->part[disk_minor].nr_sects))
+ return 0;
+
+ add_gd_partition (hd, minor, start, size);
+ return 1;
}
-int get_device_block (kdev_t dev)
+#if 0
+struct buffer_head * get_device_block (kdev_t dev, int sector)
{
- return 0;
+ return NULL;
}
+#endif
+
+/* find the primary private header, locate the LDM database,
+ * then create a partition to wrap it */
+int create_db_partition (struct gendisk *hd, kdev_t dev, struct privhead *ph)
+{
+ struct buffer_head *bh;
+ int ret = 0;
+
+ if (!ph)
+ goto cdp_end;
+ if (!(bh = bread (dev, OFF_PRIVHEAD1, 1024)))
+ goto cdp_end;
+
+ if (!parse_privhead (bh->b_data, ph))
+ goto cdp_free;
+
+ if (create_partition (hd, MINOR(dev)+LDM_DB_PART, ph->config_start, ph->config_size));
+ ret = 1;
+cdp_free:
+ brelse (bh);
+cdp_end:
+ return ret;
+}
+
+#ifdef XXX
+static inline struct buffer_head *
+get_partition_table_block(struct gendisk *hd, int minor, int blocknr)
+{
+ kdev_t dev = MKDEV(hd->major, minor);
+ return bread(dev, blocknr, get_ptable_blocksize(dev));
+}
+#endif
+
/* 1 = match, 0 = no match, -1 = error */
int ldm_partition(struct gendisk *hd, kdev_t dev,
unsigned long first_sector, int first_part_minor)
{
+ /* what about first_sector, first_part_minor? */
+ /* demote the "sector counts" to ints? -- limit of 1Tb */
struct buffer_head *bh;
struct ldmpart pt;
@@ -224,10 +270,11 @@
int j;
int k;
- int minor = first_part_minor;
+ int minor = first_part_minor + LDM_FIRST_PART;
+ kdev_t devdb;
- if (1024 != get_ptable_blocksize (dev))
+ if (get_ptable_blocksize (dev) != 1024)
goto end;
- if (512 != get_hardsect_size (dev))
+ if (get_hardsect_size (dev) != 512)
goto end;
@@ -244,64 +291,60 @@
brelse (bh);
- ret = -1; /* Anything after here is OUR problem */
+ ret = -1; /* Any problem after here are OUR problem */
- /*-----------------------------------------------------*/
- if (!(bh = bread (dev, 6, 1024)))
- goto end;
-
- data = bh->b_data;
- if (!parse_privhead (data+0x0000, &ph1))
+ if (!create_db_partition (hd, dev, &ph1))
goto free;
- brelse (bh);
- if (!(bh = bread (dev, ph1.config_start+1856, 1024)))
- goto end;
+ /* we now have a dedicated partition for our database */
+ devdb = MKDEV (MAJOR(dev), MINOR(dev)+LDM_DB_PART);
- data = bh->b_data;
- if (!parse_privhead (data, &ph2))
+ if (!(bh = bread (devdb, OFF_PRIVHEAD2, 1024)))
+ goto end;
+ if (!parse_privhead (data = bh->b_data, &ph2))
goto free;
-
brelse (bh);
- if (!(bh = bread (dev, ph1.config_start+2046, 1024)))
- goto end;
- data = bh->b_data;
- if (!parse_privhead (data + 0x0200, &ph3))
+ if (!(bh = bread (devdb, OFF_PRIVHEAD3, 1024)))
+ goto end;
+ if (!parse_privhead (data = bh->b_data + 0x0200, &ph3))
goto free;
-
brelse (bh);
+
/*-----------------------------------------------------*/
- if (!(bh = bread (dev, ph1.config_start+1, 1024)))
+ if (!(bh = bread (devdb, OFF_TOCBLOCK1, 1024)))
goto end;
-
- data = bh->b_data;
- if (!parse_tocblock (data + 0x0000, &toc1))
+ if (!parse_tocblock (data = bh->b_data + 0x0200, &toc1))
goto free;
+ brelse (bh);
- if (!parse_tocblock (data + 0x0200, &toc2))
+ if (!(bh = bread (devdb, OFF_TOCBLOCK2, 1024)))
+ goto end;
+ if (!parse_tocblock (data = bh->b_data, &toc2))
goto free;
-
brelse (bh);
- if (!(bh = bread (dev, ph1.config_start+2045, 1024)))
- goto end;
- data = bh->b_data;
- if (!parse_tocblock (data + 0x0000, &toc3))
+ if (!(bh = bread (devdb, OFF_TOCBLOCK3, 1024)))
+ goto end;
+ if (!parse_tocblock (data = bh->b_data + 0x0200, &toc3))
goto free;
+ brelse (bh);
- if (!parse_tocblock (data + 0x0200, &toc4))
+ if (!(bh = bread (devdb, OFF_TOCBLOCK4, 1024)))
+ goto end;
+ if (!parse_tocblock (data = bh->b_data, &toc4))
goto free;
-
brelse (bh);
+
/*-----------------------------------------------------*/
- if (!(bh = bread (dev, ph1.config_start+17, 1024)))
- goto end;
- data = bh->b_data;
- if (!parse_vmdb (data, &vm))
+ if (!(bh = bread (devdb, OFF_VMDB, 1024)))
+ goto end;
+ if (!parse_vmdb (data = bh->b_data + 0x200, &vm))
goto end;
+ /*-----------------------------------------------------*/
+
// take into account size and offset in vmdb
- j = vm.last_vblk_seq / 4;
+ j = vm.last_vblk_seq / 8;
// first find the correct disk
@@ -309,38 +352,34 @@
{
brelse (bh);
- if (!(bh = bread (dev, ph1.config_start+18+i, 1024)))
+ if (!(bh = bread (devdb, OFF_VBLK+i, 1024)))
goto end;
- //if (data)...
data = bh->b_data;
- for (k = 0; k < 4; k++)
+ for (k = 0; k < 8; k++)
{
+ int rel_objid;
+ int rel_name;
+ int rel_diskid;
+ char *disk_id;
u8 *block;
block = data + 0x80*k;
+ if (block[19] != VBLK_DISK)
+ continue;
- if (block[19] == VBLK_DISK)
- {
- int rel_objid;
- int rel_name;
- int rel_diskid;
- char *disk_id;
-
- /* remove the +1's */
- /* Calculate relative offsets */
- rel_objid = 1 + block[0x18];
- rel_name = 1 + block[0x18+rel_objid] + rel_objid;
- rel_diskid = 1 + block[0x18+rel_name] + rel_name;
-
- disk_id = get_vstr (block+0x18+rel_name);
-
- if (strcmp (disk_id, ph1.disk_id) == 0)
- {
- dk.obj_id = get_vnum (block+0x18);
- strcpy (dk.disk_id, disk_id);
- goto found;
- }
+ /* remove the +1's */
+ /* Calculate relative offsets */
+ rel_objid = 1 + block[0x18];
+ rel_name = 1 + block[0x18+rel_objid] + rel_objid;
+ rel_diskid = 1 + block[0x18+rel_name] + rel_name;
+
+ disk_id = get_vstr (block+0x18+rel_name);
+ if (strcmp (disk_id, ph1.disk_id) == 0)
+ {
+ dk.obj_id = get_vnum (block+0x18);
+ strcpy (dk.disk_id, disk_id);
+ goto found;
}
}
@@ -350,40 +389,32 @@
goto free;
found:
-
- printk (" Dynamic disks <");
+ printk (" <");
for (i = 0; i < j; i++)
{
brelse (bh);
- if (!(bh = bread (dev, ph1.config_start+18+i, 1024)))
+ if (!(bh = bread (devdb, OFF_VBLK+i, 1024)))
goto end;
data = bh->b_data;
- for (k = 0; k < 4; k++)
+ for (k = 0; k < 8; k++)
{
u8 *block;
block = data + 0x80*k;
+ if (block[19] != VBLK_PART)
+ continue;
- if (block[19] == VBLK_PART)
- {
- if (!parse_vblk (&ph1, data+(0x80*k), &vb))
- goto free;
- if (dk.obj_id == vb.disk_id)
- {
- printk (" %s", vb.name);
-
- hd->part[minor].start_sect = vb.start_sector + ph1.log_disk_start;
- hd->part[minor].nr_sects = vb.num_sectors;
- minor++;
- }
- }
+ if (!parse_vblk (&ph1, data+(0x80*k), &vb))
+ goto free;
+
+ if (dk.obj_id != vb.disk_id)
+ continue;
+
+ if (create_partition (hd, minor, vb.start_sector + ph1.log_disk_start, vb.num_sectors))
+ minor++;
}
}
- minor = ((minor + hd->max_p) & ~(hd->max_p - 1)) - 1; /* round up */
- hd->part[minor].start_sect = ph1.config_start;
- hd->part[minor].nr_sects = ph1.config_size;
-
printk (" >\n");
ret = 1; /* We've dealt with it */
@@ -395,10 +426,52 @@
#if 0
+ minor = ((minor + hd->max_p) & ~(hd->max_p - 1)) - 1; /* round up */
+ hd->part[minor].start_sect = ph1.config_start;
+ hd->part[minor].nr_sects = ph1.config_size;
+
+ //if (data)...?
+ /* find the three copies of the private header
+ * and verify that they are identical */
+ //LDM_FIRST_PART
+
+#define isprint(a) ((a >=' ')&&(a <= '~'))
+ if (0)
{
int offset = 0;
- printk ("0 %02x %02x %02x %02x %02x %02x %02x %02x - %c%c%c%c%c%c%c%c\n", data[offset+0], data[offset+1], data[offset+2], data[offset+3], data[offset+4], data[offset+5], data[offset+6], data[offset+7], isprint (data[offset+0]) ? data[offset+0] : '.', isprint (data[offset+1]) ? data[offset+1] : '.', isprint (data[offset+2]) ? data[offset+2] : '.', isprint (data[offset+3]) ? data[offset+3] : '.', isprint (data[offset+4]) ? data[offset+4] : '.', isprint (data[offset+5]) ? data[offset+5] : '.', isprint (data[offset+6]) ? data[offset+6] : '.', isprint (data[offset+7]) ? data[offset+7] : '.');
- offset += 512;
+ printk ("%02x %02x %02x %02x %02x %02x %02x %02x - %c%c%c%c%c%c%c%c\n", data[offset+0], data[offset+1], data[offset+2], data[offset+3], data[offset+4], data[offset+5], data[offset+6], data[offset+7], isprint (data[offset+0]) ? data[offset+0] : '.', isprint (data[offset+1]) ? data[offset+1] : '.', isprint (data[offset+2]) ? data[offset+2] : '.', isprint (data[offset+3]) ? data[offset+3] : '.', isprint (data[offset+4]) ? data[offset+4] : '.', isprint (data[offset+5]) ? data[offset+5] : '.', isprint (data[offset+6]) ? data[offset+6] : '.', isprint (data[offset+7]) ? data[offset+7] : '.');
+ offset += 128;
printk ("\n");
}
+
+void dump_sectors (kdev_t dev, int block, int size)
+{
+ struct buffer_head *bh;
+ u8 *data;
+ int i, off = 0;
+
+ if (!(bh = bread (dev, block, size)))
+ return;
+
+ printk ("block = %d, size = %d\n", block, size);
+
+ data = bh->b_data;
+
+ for (i = 0; i < size/512; i++, off+=512)
+ {
+ printk ("%d %02x %02x %02x %02x\n", i, data[off+0], data[off+1], data[off+2], data[off+3]);
+ }
+ printk ("\n");
+
+ bforget (bh);
+}
+
+ set_blocksize (dev, 512);
+ if (!(bh = bread (dev, 1, 512)))
+ return -1;
+
+ if (bh->b_data[0] != 1)
+ return 0;
+ bforget (bh);
+
#endif
Index: ldm.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- ldm.h 2001/06/18 02:53:19 1.2
+++ ldm.h 2001/06/20 02:55:42 1.3
@@ -43,7 +43,23 @@
#define VBLK_VOLU 0x51 /* Volume */
+#define LDM_DB_PART 1 /* hd?1, LDM Database */
+#define LDM_FIRST_PART 5 /* hd?5, first LDM partition */
+
+/* Offsets to structures within the LDM Database */
+#define OFF_PRIVHEAD1 3 /* Private Headers */
+#define OFF_PRIVHEAD2 928
+#define OFF_PRIVHEAD3 1023
+
+#define OFF_TOCBLOCK1 0 /* Table of Contents */
+#define OFF_TOCBLOCK2 1
+#define OFF_TOCBLOCK3 1022
+#define OFF_TOCBLOCK4 1023
+
+#define OFF_VMDB 8 /* The list of partitions */
+#define OFF_VBLK 9
+
#define WIN2K_DYNAMIC_PARTITION 0x42 /* Formerly SFS */
-/* borrowed from msdos.c */
+/* Borrowed from msdos.c */
#define SYS_IND(p) (get_unaligned(&p->sys_ind))
#define NR_SECTS(p) ({ __typeof__(p->nr_sects) __a = \
@@ -76,23 +92,23 @@
struct ldmpart
{
- __u64 start_sector;
- __u64 num_sectors;
+ u64 start_sector;
+ u64 num_sectors;
};
struct ldmdisk
{
- __u64 obj_id;
- __u8 disk_id[64];
+ u64 obj_id;
+ u8 disk_id[64];
};
struct privhead /* Offsets and sizes in sectors */
{
- __u16 ver_major;
- __u16 ver_minor;
- __u64 log_disk_start;
- __u64 log_disk_size;
- __u64 config_start;
- __u64 config_size;
- __u8 disk_id[64];
+ u16 ver_major;
+ u16 ver_minor;
+ u64 log_disk_start;
+ u64 log_disk_size;
+ u64 config_start;
+ u64 config_size;
+ u8 disk_id[64];
};
@@ -104,19 +120,19 @@
struct vmdb
{
- __u16 ver_major;
- __u16 ver_minor;
- __u32 vblk_size;
- __u32 vblk_offset;
- __u32 last_vblk_seq;
+ u16 ver_major;
+ u16 ver_minor;
+ u32 vblk_size;
+ u32 vblk_offset;
+ u32 last_vblk_seq;
};
struct vblk
{
- __u8 name[64];
- __u8 vblk_type;
- __u64 obj_id;
- __u64 disk_id;
- __u64 start_sector;
- __u64 num_sectors;
+ u8 name[64];
+ u8 vblk_type;
+ u64 obj_id;
+ u64 disk_id;
+ u64 start_sector;
+ u64 num_sectors;
};
|
|
From: Richard R. <fl...@us...> - 2001-06-19 11:00:45
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/dynamic-disk/test In directory usw-pr-cvs1:/tmp/cvs-serv16411 Modified Files: Makefile.in Log Message: remove reread Index: Makefile.in =================================================================== RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -U2 -r1.2 -r1.3 --- Makefile.in 2001/06/19 02:40:50 1.2 +++ Makefile.in 2001/06/19 11:00:42 1.3 @@ -1,9 +1,9 @@ # Copyright (C) 2001 Richard Russon -SRC = drive.c reread.c -OBJ = drive.o reread.o +SRC = drive.c +OBJ = drive.o DEP = ../partitions.o -OUT = drive reread +OUT = drive CC = gcc |
|
From: Richard R. <fl...@us...> - 2001-06-19 10:50:29
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/dynamic-disk/test In directory usw-pr-cvs1:/tmp/cvs-serv13794 Removed Files: reread.c Log Message: hmm... /sbin/blockdev --- reread.c DELETED --- |
|
From: Richard R. <fl...@us...> - 2001-06-19 02:40:53
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/dynamic-disk/test In directory usw-pr-cvs1:/tmp/cvs-serv23370 Modified Files: Makefile.in drive.c Added Files: reread.c Log Message: util to force the kernel to reread a partition --- NEW FILE --- /* * $Id: reread.c,v 1.1 2001/06/19 02:40:50 flatcap Exp $ * * reread - Part of the Linux-NTFS project. * * Copyright (C) 2001 Richard Russon <nt...@fl...> * * Documentation is available at http://linux-ntfs.sourceforge.net/ldm * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation; either version 2 of the License, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program (in the main directory of the Linux-NTFS source * in the file COPYING); if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <stdio.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> #include <errno.h> #include <string.h> #include <unistd.h> #include <sys/ioctl.h> #include <linux/fs.h> int main (int argc, char *argv[]) { int ret = 1; int fd = 0; if (argc != 2) { printf ("ReRead: Force the kernel to reread the partition table on a given device."); printf ("Usage:\n\t%s device\n", argv[0]); goto end; } fd = open (argv[1], O_RDONLY); if (fd < 0) { printf("open failed (%d: %s)\n", errno, strerror(errno)); goto end; } if ((ioctl(fd, BLKRRPART)) < 0) { printf("ioctl failed (%d: %s)\n", errno, strerror(errno)); goto close; } printf ("succeeded\n"); ret = 0; close: close (fd); end: return 0; } Index: Makefile.in =================================================================== RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/Makefile.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -U2 -r1.1.1.1 -r1.2 --- Makefile.in 2001/06/16 20:29:39 1.1.1.1 +++ Makefile.in 2001/06/19 02:40:50 1.2 @@ -1,9 +1,9 @@ # Copyright (C) 2001 Richard Russon -SRC = drive.c -OBJ = drive.o +SRC = drive.c reread.c +OBJ = drive.o reread.o DEP = ../partitions.o -OUT = drive +OUT = drive reread CC = gcc @@ -26,5 +26,5 @@ CFLAGS += -D_FILE_OFFSET_BITS=64 -all: $(DEP) $(SRC) $(OUT) ../$(OUT) +all: $(DEP) $(SRC) $(OUT) .c.o: @@ -34,9 +34,6 @@ $(CC) -o $(OUT) $(DEP) $(OBJ) -../$(OUT): $(OUT) - $(CP) $(OUT) .. - clean: - $(RM) $(OUT) $(OBJ) ../$(OUT) + $(RM) $(OUT) $(OBJ) distclean: clean Index: drive.c =================================================================== RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/drive.c,v retrieving revision 1.3 retrieving revision 1.4 diff -U2 -r1.3 -r1.4 --- drive.c 2001/06/18 03:13:24 1.3 +++ drive.c 2001/06/19 02:40:50 1.4 @@ -2,5 +2,5 @@ * $Id$ * - * ldm - Part of the Linux-NTFS project. + * drive - Part of the Linux-NTFS project. * * Copyright (C) 2001 Richard Russon <nt...@fl...> |
|
From: Anton A. <an...@us...> - 2001-06-19 00:55:52
|
Changes by: antona
Update of /cvsroot/linux-ntfs/ntfs-driver-2.4/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv5698
Modified Files:
Makefile inode.c
Log Message:
Remove bogus NULL check that the Stanford Checker complained about & bump
version number up to distinguish from the in kernel NTFS version.
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/linux/fs/ntfs/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- Makefile 2001/06/11 23:20:31 1.1
+++ Makefile 2001/06/19 00:55:47 1.2
@@ -6,5 +6,5 @@
obj-m := $(O_TARGET)
# New version format started 3 February 2001.
-EXTRA_CFLAGS = -DNTFS_VERSION=\"1.1.15\" #-DDEBUG
+EXTRA_CFLAGS = -DNTFS_VERSION=\"1.1.16\" #-DDEBUG
include $(TOPDIR)/Rules.make
Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-2.4/linux/fs/ntfs/inode.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- inode.c 2001/06/11 17:50:25 1.2
+++ inode.c 2001/06/19 00:55:47 1.3
@@ -418,6 +418,4 @@
ntfs_debug(DEBUG_FILE1, "Initializing inode %x\n", inum);
- if (!vol)
- ntfs_error("NO VOLUME!\n");
ino->i_number = inum;
ino->vol = vol;
|
|
From: Richard R. <fl...@us...> - 2001-06-18 03:13:27
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/dynamic-disk/test In directory usw-pr-cvs1:/tmp/cvs-serv30640 Modified Files: drive.c Log Message: added copyright Index: drive.c =================================================================== RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/drive.c,v retrieving revision 1.2 retrieving revision 1.3 diff -U2 -r1.2 -r1.3 --- drive.c 2001/06/17 13:46:17 1.2 +++ drive.c 2001/06/18 03:13:24 1.3 @@ -1,2 +1,27 @@ +/* + * $Id$ + * + * ldm - Part of the Linux-NTFS project. + * + * Copyright (C) 2001 Richard Russon <nt...@fl...> + * + * Documentation is available at http://linux-ntfs.sourceforge.net/ldm + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program (in the main directory of the Linux-NTFS source + * in the file COPYING); if not, write to the Free Software Foundation, + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #define __KERNEL__ #include <linux/types.h> |
|
From: Richard R. <fl...@us...> - 2001-06-18 02:53:22
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv27847/linux/fs/partitions
Modified Files:
ldm.c ldm.h
Log Message:
clean up and paranoid bulletproofing
Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- ldm.c 2001/06/17 13:46:16 1.2
+++ ldm.c 2001/06/18 02:53:19 1.3
@@ -25,21 +25,17 @@
#include <asm/types.h>
+#include <asm/unaligned.h>
+#include <asm/byteorder.h>
#include <linux/genhd.h>
+#include <linux/blkdev.h>
#include "check.h"
#include "ldm.h"
#include "msdos.h"
-#define SWAB16(x) (__u16) __arch__swab16 (*((__u16 *) (x)))
-#define SWAB32(x) (__u32) __arch__swab32 (*((__u32 *) (x)))
-#define SWAB64(x) (__u64) __arch__swab64 (*((__u64 *) (x)))
-
/* Get a variable-width number
- * The width is stored in a byte before the number
- */
-__u64 get_vnum (__u8 *block)
+ * The width is stored in a byte before the number */
+static u64 get_vnum (u8 *block)
{
- __u64 value = 0;
- int length;
- int i;
+ u8 length;
if (!block)
@@ -47,25 +43,16 @@
length = block[0];
- if (length > 8)
+ if ((length < 1) || (length > 8))
return 0;
- for (i = 1; i <= length; i++)
- {
- value <<= 8;
- value += block[i];
- }
-
- return value;
+ return BE64(block+1) >> (64 - (length<<3));
}
/* Extract a non-null-terminated ASCII string.
- * The length is stored in a byte before the string
- */
-__u8 * get_vstr (__u8 *block)
+ * The length is stored in a byte before the string */
+static u8 * get_vstr (u8 *block)
{
- static __u8 buffer[256];
- int length = 0;
-
- memset (buffer, 0, sizeof (buffer));
+ static u8 buffer[256];
+ u8 length = 0;
if (block)
@@ -74,12 +61,11 @@
memcpy (buffer, block+1, length);
}
-
+ buffer[length] = 0;
return buffer;
}
/* We're looking for an MSDOS-style partition table with one entry in it:
- * 0x42, which works like an extended partition. Detail will be placed in pt.
- */
-int parse_part_table (__u8 *buffer, struct ldmpart *pt)
+ * 0x42, which works like an extended partition. Detail will be placed in pt.*/
+int parse_part_table (u8 *buffer, struct ldmpart *pt)
{
struct partition *p;
@@ -88,5 +74,5 @@
return 0;
- if (*(__u16*) (buffer + 0x01FE) != cpu_to_le16 (MSDOS_LABEL_MAGIC))
+ if (*(u16*) (buffer + 0x01FE) != cpu_to_le16 (MSDOS_LABEL_MAGIC))
return 0;
@@ -102,40 +88,33 @@
}
-int parse_privhead (__u8 *buffer, struct privhead *ph)
+int parse_privhead (u8 *buffer, struct privhead *ph)
{
if (!buffer || !ph)
return 0;
- /* le to cpu */
- if (MAGIC_PRIVHEAD != *((__u64*) buffer))
+ if (MAGIC_PRIVHEAD != BE64 (buffer))
return 0;
- /* get unaligned? */ /* BIG ENDIAN */
- ph->log_disk_start = SWAB64 (buffer + 0x011B);
- ph->log_disk_size = SWAB64 (buffer + 0x0123);
- ph->config_start = SWAB64 (buffer + 0x012B);
- ph->config_size = SWAB64 (buffer + 0x0133);
-
- memcpy (ph->disk_id, buffer + 0x0030, 64);
+ ph->ver_major = BE16 (buffer + 0x000C);
+ ph->ver_minor = BE16 (buffer + 0x000E);
+ if ((ph->ver_major != 2) || (ph->ver_minor != 11))
+ return 0;
- /*
- printk ("log_disk_start = %lld\n", ph->log_disk_start);
- printk ("log_disk_size = %lld\n", ph->log_disk_size);
- printk ("config_start = %lld\n", ph->config_start);
- printk ("config_size = %lld\n", ph->config_size);
+ ph->log_disk_start = BE64 (buffer + 0x011B);
+ ph->log_disk_size = BE64 (buffer + 0x0123);
+ ph->config_start = BE64 (buffer + 0x012B);
+ ph->config_size = BE64 (buffer + 0x0133);
- printk ("disk_id = %s\n", ph->disk_id);
- */
+ memcpy (ph->disk_id, buffer + 0x0030, 64);
return 1;
}
-int parse_tocblock (__u8 *buffer, struct tocblock *toc)
+int parse_tocblock (u8 *buffer, struct tocblock *toc)
{
if (!buffer || !toc)
return 0;
-
- /* le to cpu */
- if (MAGIC_TOCBLOCK != *((__u64*) buffer))
+
+ if (MAGIC_TOCBLOCK != BE64 (buffer))
return 0;
@@ -143,25 +122,25 @@
}
-int parse_vmdb (__u8 *buffer, struct vmdb *vm)
+int parse_vmdb (u8 *buffer, struct vmdb *vm)
{
if (!buffer || !vm)
+ return 0;
+
+ if (MAGIC_VMDB != BE32 (buffer))
return 0;
-
- //printk ("parse_vmdb\n");
- /* le to cpu */
- if (MAGIC_VMDB != *((__u32*) buffer))
+ vm->ver_major = BE16 (buffer + 0x12);
+ vm->ver_minor = BE16 (buffer + 0x14);
+ if ((vm->ver_major != 4) || (vm->ver_minor != 10))
return 0;
- vm->ver_major = SWAB16 (buffer + 0x12);
- vm->ver_minor = SWAB16 (buffer + 0x14);
- vm->vblk_size = SWAB32 (buffer + 0x08);
- vm->vblk_offset = SWAB32 (buffer + 0x0C);
- vm->last_vblk_seq = SWAB32 (buffer + 0x04);
+ vm->vblk_size = BE32 (buffer + 0x08);
+ vm->vblk_offset = BE32 (buffer + 0x0C);
+ vm->last_vblk_seq = BE32 (buffer + 0x04);
return 1;
}
-int parse_partition (__u8 *buffer, struct vblk *vb)
+int parse_partition (u8 *buffer, struct vblk *vb)
{
int rel_objid;
@@ -179,5 +158,5 @@
vb->obj_id = get_vnum (buffer+0x18);
vb->disk_id = get_vnum (buffer+0x34+rel_parent);
- vb->start_sector = SWAB64 (buffer+0x24+rel_name);
+ vb->start_sector = BE64 (buffer+0x24+rel_name);
vb->num_sectors = get_vnum (buffer+0x34+rel_name);
strcpy (vb->name, get_vstr (buffer+0x18+rel_objid));
@@ -186,16 +165,13 @@
}
-int parse_vblk (struct privhead *ph, __u8 *buffer, struct vblk *vb)
+int parse_vblk (struct privhead *ph, u8 *buffer, struct vblk *vb)
{
if (!buffer || !vb)
return 0;
-
- //printk ("parse_vblk\n");
- /* le to cpu */
- if (MAGIC_VBLK != *((__u32*) buffer))
+ if (MAGIC_VBLK != BE32 (buffer))
return 0;
- if (SWAB16 (buffer+14) == 0) /* record not in use */
+ if (BE16 (buffer+14) == 0) /* record not in use */
return 0;
@@ -215,9 +191,20 @@
}
+/* find the three copies of the private header
+ * and verify that they are identical */
+int get_privhead (struct privhead *ph)
+{
+ return 0;
+}
+
+int get_device_block (kdev_t dev)
+{
+ return 0;
+}
+
/* 1 = match, 0 = no match, -1 = error */
int ldm_partition(struct gendisk *hd, kdev_t dev,
unsigned long first_sector, int first_part_minor)
{
- //int sector_size; sector_size = get_hardsect_size (dev);
struct buffer_head *bh;
struct ldmpart pt;
@@ -232,17 +219,18 @@
struct vblk vb;
struct ldmdisk dk;
- __u8 *data;
- int ret = -1;
- int blocksize;
- int size;
+ u8 *data;
+ int ret = 0;
int i;
int j;
int k;
int minor = first_part_minor;
+
+ if (1024 != get_ptable_blocksize (dev))
+ goto end;
- blocksize = get_ptable_blocksize (dev);
- size = (0x1000 / blocksize) * blocksize; /* need at least 3.5K */
+ if (512 != get_hardsect_size (dev))
+ goto end;
- if (!(bh = bread (dev, 0, size)))
+ if (!(bh = bread (dev, 0, 1024)))
{
if (warn_no_part)
@@ -250,52 +238,53 @@
goto end;
}
-
- data = bh->b_data;
-
- if (!parse_part_table (data, &pt))
- {
- ret = 0;
- goto free;
- }
- if (!parse_privhead (data+0x0C00, &ph1)) /* Fixed offset */
+ if (!parse_part_table (bh->b_data, &pt))
goto free;
brelse (bh);
- if (!(bh = bread (dev, ph1.config_start, 2*blocksize)))
- goto end;
- data = bh->b_data;
+ ret = -1; /* Anything after here is OUR problem */
- if (!parse_tocblock (data + 0x0200, &toc1))
- goto free;
+ /*-----------------------------------------------------*/
+ if (!(bh = bread (dev, 6, 1024)))
+ goto end;
- if (!parse_tocblock (data + 0x0400, &toc2))
+ data = bh->b_data;
+ if (!parse_privhead (data+0x0000, &ph1))
goto free;
brelse (bh);
- if (!(bh = bread (dev, ph1.config_start+17, blocksize)))
+ if (!(bh = bread (dev, ph1.config_start+1856, 1024)))
goto end;
data = bh->b_data;
+ if (!parse_privhead (data, &ph2))
+ goto free;
- if (!parse_vmdb (data, &vm))
+ brelse (bh);
+ if (!(bh = bread (dev, ph1.config_start+2046, 1024)))
goto end;
+ data = bh->b_data;
+ if (!parse_privhead (data + 0x0200, &ph3))
+ goto free;
+
brelse (bh);
- if (!(bh = bread (dev, ph1.config_start+1856, blocksize)))
+ /*-----------------------------------------------------*/
+ if (!(bh = bread (dev, ph1.config_start+1, 1024)))
goto end;
data = bh->b_data;
+ if (!parse_tocblock (data + 0x0000, &toc1))
+ goto free;
- if (!parse_privhead (data, &ph2))
+ if (!parse_tocblock (data + 0x0200, &toc2))
goto free;
brelse (bh);
- if (!(bh = bread (dev, ph1.config_start+2045, blocksize)))
+ if (!(bh = bread (dev, ph1.config_start+2045, 1024)))
goto end;
data = bh->b_data;
-
if (!parse_tocblock (data + 0x0000, &toc3))
goto free;
@@ -305,13 +294,11 @@
brelse (bh);
- if (!(bh = bread (dev, ph1.config_start+2046, blocksize)))
+ /*-----------------------------------------------------*/
+ if (!(bh = bread (dev, ph1.config_start+17, 1024)))
goto end;
data = bh->b_data;
-
- if (!parse_privhead (data + 0x0200, &ph3))
- goto free;
-
- //printk ("LDM (%d entries)\n", vm.last_vblk_seq - 4);
+ if (!parse_vmdb (data, &vm))
+ goto end;
// take into account size and offset in vmdb
@@ -322,12 +309,13 @@
{
brelse (bh);
- if (!(bh = bread (dev, ph1.config_start+18+i, blocksize)))
+ if (!(bh = bread (dev, ph1.config_start+18+i, 1024)))
goto end;
+ //if (data)...
data = bh->b_data;
for (k = 0; k < 4; k++)
{
- __u8 *block;
+ u8 *block;
block = data + 0x80*k;
@@ -340,4 +328,5 @@
char *disk_id;
+ /* remove the +1's */
/* Calculate relative offsets */
rel_objid = 1 + block[0x18];
@@ -347,11 +336,4 @@
disk_id = get_vstr (block+0x18+rel_name);
- //printk ("block = %p\n", block);
- //printk ("0x%06X: [%06X] <Disk>\n", SWAB32 (block+0x04), SWAB32 (block+0x08));
- //printk (" Name : %s\n", get_vstr (block+0x18+rel_objid));
- //printk (" Object Id : 0x%04llx\n", get_vnum (block+0x18));
- //printk (" Disk Id : %s\n", disk_id);
-
- //printk ("<%s>, <%s>\n", disk_id, ph1.disk_id);
if (strcmp (disk_id, ph1.disk_id) == 0)
{
@@ -373,5 +355,5 @@
{
brelse (bh);
- if (!(bh = bread (dev, ph1.config_start+18+i, blocksize)))
+ if (!(bh = bread (dev, ph1.config_start+18+i, 1024)))
goto end;
@@ -380,5 +362,5 @@
for (k = 0; k < 4; k++)
{
- __u8 *block;
+ u8 *block;
block = data + 0x80*k;
Index: ldm.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U2 -r1.1.1.1 -r1.2
--- ldm.h 2001/06/16 20:29:39 1.1.1.1
+++ ldm.h 2001/06/18 02:53:19 1.2
@@ -27,10 +27,13 @@
*/
+#include <asm/types.h>
#include <asm/unaligned.h>
+#include <asm/byteorder.h>
-#define MAGIC_VMDB 0x42444D56 /* "VMDB" */
-#define MAGIC_VBLK 0x4B4C4256 /* "VBLK" */
-#define MAGIC_PRIVHEAD 0x4441454856495250 /* "PRIVHEAD" */
-#define MAGIC_TOCBLOCK 0x4B434F4C42434F54 /* "TOCBLOCK" */
+/* Magic numbers in big-endian format */
+#define MAGIC_VMDB 0x564D4442 /* "VMDB" */
+#define MAGIC_VBLK 0x56424C4B /* "VBLK" */
+#define MAGIC_PRIVHEAD 0x5052495648454144 /* "PRIVHEAD" */
+#define MAGIC_TOCBLOCK 0x544F43424C4F434B /* "TOCBLOCK" */
#define VBLK_COMP 0x32 /* Component */
@@ -54,4 +57,21 @@
})
+/* Most numbers we deal with are big-endian and won't be aligned */
+#define BE16(x) (u16) be16_to_cpu (get_unaligned ((u16*)(x)))
+#define BE32(x) (u32) be32_to_cpu (get_unaligned ((u32*)(x)))
+#define BE64(x) (u64) be64_to_cpu (get_unaligned ((u64*)(x)))
+
+/* Borrowed from msdos.c */
+#define SYS_IND(p) (get_unaligned(&p->sys_ind))
+#define NR_SECTS(p) ({ __typeof__(p->nr_sects) __a = \
+ get_unaligned(&p->nr_sects); \
+ le32_to_cpu(__a); \
+ })
+
+#define START_SECT(p) ({ __typeof__(p->start_sect) __a = \
+ get_unaligned(&p->start_sect); \
+ le32_to_cpu(__a); \
+ })
+
struct ldmpart
{
@@ -68,4 +88,6 @@
struct privhead /* Offsets and sizes in sectors */
{
+ __u16 ver_major;
+ __u16 ver_minor;
__u64 log_disk_start;
__u64 log_disk_size;
|
|
From: Richard R. <fl...@us...> - 2001-06-18 02:53:22
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/dynamic-disk In directory usw-pr-cvs1:/tmp/cvs-serv27847 Modified Files: Makefile.driver.in Log Message: clean up and paranoid bulletproofing Index: Makefile.driver.in =================================================================== RCS file: /cvsroot/linux-ntfs/dynamic-disk/Makefile.driver.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -U2 -r1.1.1.1 -r1.2 --- Makefile.driver.in 2001/06/16 20:29:36 1.1.1.1 +++ Makefile.driver.in 2001/06/18 02:53:18 1.2 @@ -44,6 +44,4 @@ $(CP) $(SRCDIR)/$(OUT) $(OUT) -$(OBJ): $(SRC) $(HDR) - .c.o: $(CC) $(CFLAGS) -c $< -o $@ |
|
From: Richard R. <fl...@us...> - 2001-06-17 13:46:20
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/dynamic-disk/test
In directory usw-pr-cvs1:/tmp/cvs-serv1349/test
Modified Files:
drive.c
Log Message:
fixed up the offset, created dummy partition for VMDB
Index: drive.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/drive.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U2 -r1.1.1.1 -r1.2
--- drive.c 2001/06/16 20:29:39 1.1.1.1
+++ drive.c 2001/06/17 13:46:17 1.2
@@ -113,14 +113,18 @@
unsigned long long size;
int i;
+ int a;
int drive = (3<<8) + 64;
int maxminor = 64;
- memset (hardsect_size, 0, sizeof (hardsect_size));
- memset (blk_size, 0, sizeof (blk_size));
- memset (blksize_size, 0, sizeof (blksize_size));
+ if (argc < 2)
+ {
+ printf ("Usage:\n");
+ printf (" %s device ...\n", argv[0]);
+ return 1;
+ }
- if (argc == 2)
+ for (a = 1; a < argc; a++)
{
- device = open (argv[1], O_RDONLY);
+ device = open (argv[a], O_RDONLY);
if (device < 0)
{
@@ -132,13 +136,22 @@
if (size > 0)
{
+ memset (hardsect_size, 0, sizeof (hardsect_size));
+ memset (blk_size, 0, sizeof (blk_size));
+ memset (blksize_size, 0, sizeof (blksize_size));
+ memset (hd, 0, sizeof (hd));
+ memset (hd_sizes, 0, sizeof (hd_sizes));
+
register_disk (&hd_gendisk, drive, maxminor, NULL, size);
}
close (device);
- printf ("\nDevice Offset Size\n");
+ printf ("\nDevice | Offset Bytes Sectors Mb | Size Bytes Sectors Mb\n"
+ "-------+--------------------------------+-------------------------------\n");
for (i = 0; i < 256; i++)
{
char buf[10];
int minor = i % maxminor;
+ long long start;
+ long long size;
if (hd[i].nr_sects == 0)
@@ -150,13 +163,10 @@
sprintf (buf, "%s%c", hd_gendisk.major_name, (i>>hd_gendisk.minor_shift) + 'a');
- printf ("%-6s %10ld %10ld (%ld Mb)\n", buf, hd[i].start_sect, hd[i].nr_sects, hd[i].nr_sects>>11);
+ start = hd[i].start_sect; start <<= 9;
+ size = hd[i].nr_sects; size <<= 9;
+ printf ("%-6s | %12lld %10lld %6lld | %12lld %10lld %6lld\n", buf, start, start>>9, start>>20, size, size>>9, size>>20);
}
printf ("\n");
}
- }
- else
- {
- printf ("Usage:\n");
- printf (" %s device\n", argv[0]);
}
|
|
From: Richard R. <fl...@us...> - 2001-06-17 13:46:20
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv1349/linux/fs/partitions
Modified Files:
ldm.c
Log Message:
fixed up the offset, created dummy partition for VMDB
Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U2 -r1.1.1.1 -r1.2
--- ldm.c 2001/06/16 20:29:39 1.1.1.1
+++ ldm.c 2001/06/17 13:46:16 1.2
@@ -40,5 +40,5 @@
{
__u64 value = 0;
- int length = 0;
+ int length;
int i;
@@ -392,5 +392,5 @@
printk (" %s", vb.name);
- hd->part[minor].start_sect = vb.start_sector;
+ hd->part[minor].start_sect = vb.start_sector + ph1.log_disk_start;
hd->part[minor].nr_sects = vb.num_sectors;
minor++;
@@ -399,4 +399,8 @@
}
}
+
+ minor = ((minor + hd->max_p) & ~(hd->max_p - 1)) - 1; /* round up */
+ hd->part[minor].start_sect = ph1.config_start;
+ hd->part[minor].nr_sects = ph1.config_size;
printk (" >\n");
|
|
From: Richard R. <fl...@us...> - 2001-06-17 13:46:20
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/dynamic-disk/linux/Documentation In directory usw-pr-cvs1:/tmp/cvs-serv1349/linux/Documentation Modified Files: Configure.help Log Message: fixed up the offset, created dummy partition for VMDB Index: Configure.help =================================================================== RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/Documentation/Configure.help,v retrieving revision 1.1 retrieving revision 1.2 diff -U2 -r1.1 -r1.2 --- Configure.help 2001/06/16 22:54:54 1.1 +++ Configure.help 2001/06/17 13:46:16 1.2 @@ -13169,5 +13169,5 @@ the limitations of the PC's partitioning scheme. The Logical Disk Manager allows the user to repartion a disk and create spanned, - mirrored, striped or raid volumes, all without the need for + mirrored, striped or RAID volumes, all without the need for rebooting. |
|
From: Richard R. <fl...@us...> - 2001-06-16 22:54:57
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv2597/linux/fs/partitions
Added Files:
Config.in Makefile
Log Message:
added config info
--- NEW FILE ---
#
# Partition configuration
#
bool 'Advanced partition selection' CONFIG_PARTITION_ADVANCED
if [ "$CONFIG_PARTITION_ADVANCED" = "y" ]; then
bool ' Acorn partition support' CONFIG_ACORN_PARTITION
if [ "$CONFIG_ACORN_PARTITION" != "n" ]; then
# bool ' Cumana partition support' CONFIG_ACORN_PARTITION_CUMANA
bool ' ICS partition support' CONFIG_ACORN_PARTITION_ICS
bool ' Native filecore partition support' CONFIG_ACORN_PARTITION_ADFS
bool ' PowerTec partition support' CONFIG_ACORN_PARTITION_POWERTEC
bool ' RISCiX partition support' CONFIG_ACORN_PARTITION_RISCIX
fi
bool ' Alpha OSF partition support' CONFIG_OSF_PARTITION
bool ' Amiga partition table support' CONFIG_AMIGA_PARTITION
bool ' Atari partition table support' CONFIG_ATARI_PARTITION
if [ "$CONFIG_ARCH_S390" = "y" ]; then
bool ' IBM disk label and partition support' CONFIG_IBM_PARTITION
fi
bool ' Macintosh partition map support' CONFIG_MAC_PARTITION
bool ' PC BIOS (MSDOS partition tables) support' CONFIG_MSDOS_PARTITION
if [ "$CONFIG_MSDOS_PARTITION" = "y" ]; then
bool ' BSD disklabel (FreeBSD partition tables) support' CONFIG_BSD_DISKLABEL
bool ' Minix subpartition support' CONFIG_MINIX_SUBPARTITION
bool ' Solaris (x86) partition table support' CONFIG_SOLARIS_X86_PARTITION
bool ' Unixware slices support' CONFIG_UNIXWARE_DISKLABEL
fi
bool ' Windows Logical Disk Manager (Dynamic Disk) support' CONFIG_LDM_PARTITION
bool ' SGI partition support' CONFIG_SGI_PARTITION
bool ' Ultrix partition table support' CONFIG_ULTRIX_PARTITION
bool ' Sun partition tables support' CONFIG_SUN_PARTITION
else
if [ "$ARCH" = "alpha" ]; then
define_bool CONFIG_OSF_PARTITION y
fi
if [ "$CONFIG_AMIGA" != "y" -a "$CONFIG_ATARI" != "y" -a \
"$CONFIG_MAC" != "y" -a "$CONFIG_SGI_IP22" != "y" -a \
"$CONFIG_SGI_IP27" != "y" ]; then
define_bool CONFIG_MSDOS_PARTITION y
fi
if [ "$CONFIG_AMIGA" = "y" ]; then
define_bool CONFIG_AMIGA_PARTITION y
fi
if [ "$CONFIG_MAC" = "y" ]; then
define_bool CONFIG_MAC_PARTITION y
fi
if [ "$CONFIG_ARCH_ACORN" = "y" ]; then
define_bool CONFIG_ACORN_PARTITION y
define_bool CONFIG_ACORN_PARTITION_ADFS y
# define_bool CONFIG_ACORN_PARTITION_CUMANA y
define_bool CONFIG_ACORN_PARTITION_ICS y
define_bool CONFIG_ACORN_PARTITION_POWERTEC y
define_bool CONFIG_ACORN_PARTITION_RISCIX y
fi
if [ "$CONFIG_ATARI" = "y" ]; then
define_bool CONFIG_ATARI_PARTITION y
fi
if [ "$CONFIG_SGI_IP22" = "y" -o "$CONFIG_SGI_IP27" = "y" ]; then
define_bool CONFIG_SGI_PARTITION y
fi
if [ "$CONFIG_DECSTATION" = "y" ]; then
define_bool CONFIG_ULTRIX_PARTITION y
fi
if [ "$ARCH" = "sparc" -o "$ARCH" = "sparc64" ]; then
define_bool CONFIG_SUN_PARTITION y
fi
fi
--- NEW FILE ---
#
# Makefile for the linux kernel.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# Note 2! The CFLAGS definitions are now in the main makefile...
O_TARGET := partitions.o
export-objs := check.o ibm.o
obj-y := check.o
obj-$(CONFIG_ACORN_PARTITION) += acorn.o
obj-$(CONFIG_AMIGA_PARTITION) += amiga.o
obj-$(CONFIG_ATARI_PARTITION) += atari.o
obj-$(CONFIG_LDM_PARTITION) += ldm.o
obj-$(CONFIG_MAC_PARTITION) += mac.o
obj-$(CONFIG_MSDOS_PARTITION) += msdos.o
obj-$(CONFIG_OSF_PARTITION) += osf.o
obj-$(CONFIG_SGI_PARTITION) += sgi.o
obj-$(CONFIG_SUN_PARTITION) += sun.o
obj-$(CONFIG_ULTRIX_PARTITION) += ultrix.o
obj-$(CONFIG_IBM_PARTITION) += ibm.o
include $(TOPDIR)/Rules.make
|
|
From: Richard R. <fl...@us...> - 2001-06-16 22:54:57
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/dynamic-disk/linux/Documentation In directory usw-pr-cvs1:/tmp/cvs-serv2597/linux/Documentation Added Files: Configure.help Log Message: added config info --- NEW FILE --- # Maintained by: # Eric S. Raymond <mailto:es...@th...> # Steven Cole <mailto:ele...@me...> # # Merged version 2.5: Current with 2.4.6-pre1 and 2.4.5-ac12. # # This version of the Linux kernel configuration help texts # corresponds to the kernel versions 2.4.x. # # Translations of this file available on the WWW: # # - Japanese, maintained by the JF Project <mailto:JF...@li...>, at # <http://www.linux.or.jp/JF/JFdocs/Configure.help/> # - Russian, by <mailto:ka...@li...>, at # <http://nevod.perm.su/service/linux/doc/kernel/Configure.help> # - French, by Pierre Tane <mailto:ta...@bi...>, at # <http://www.traduc.org/kernelfr> # - Polish, by Cezar Cichocki <mailto:ce...@cs...>, at # <http://www.cs.net.pl/~cezar/Kernel> [...21931 lines suppressed...] # LocalWords: lanstreamer baseT HAPPYMEAL qfe sunhme SUNLANCE sunlance BigMAC # LocalWords: SUNBMAC sunbmac QuadEthernet SUNQE qe FastEthernet sunqe DSB PTI # LocalWords: DSBR dsbr procinfo QLOGICPTI qpti ptisp QLGC qlogicpti se LBA NF # LocalWords: OPENPROMFS OpenPROM openpromfs OBP OpenBoot flashable Multiboard # LocalWords: SPARCAUDIO SparcClassic Ultras DBRI Sparcbook sparcaudio SUNBPP # LocalWords: UltraDMA WDC CRC CONNTRACK IPTABLES iptables nfmark interface's # LocalWords: tdfxfb TNTx HGA hgafb VERBOSEDEBUG SunTrunking SunSoft XIRTULIP # LocalWords: ethercards PNIC Macronix MXIC ASIX xircom Mustek MDC gphoto mdc # LocalWords: CramFs Cramfs uid cramfs AVM's kernelcapi PCIV cdrdao Cdparanoia # LocalWords: DMX Domex dmx wellington ftdi sio Accton Billington Corega FEter # LocalWords: MELCO LUA PNA Linksys SNC chkdsk AWACS Webcam RAMFS Ramfs ramfs # LocalWords: ramfiles MAKEDEV pty WDTPCI APA apa # # The following sets edit modes for GNU EMACS # Local Variables: # case-fold-search:nil # fill-prefix:" " # adaptive-fill:nil # fill-column:70 # End: |
|
From: Richard R. <fl...@us...> - 2001-06-16 22:54:57
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/dynamic-disk In directory usw-pr-cvs1:/tmp/cvs-serv2597 Modified Files: Makefile.in Log Message: added config info Index: Makefile.in =================================================================== RCS file: /cvsroot/linux-ntfs/dynamic-disk/Makefile.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -U2 -r1.1.1.1 -r1.2 --- Makefile.in 2001/06/16 20:29:36 1.1.1.1 +++ Makefile.in 2001/06/16 22:54:54 1.2 @@ -1,3 +1,3 @@ -LINKS = src +LINKS = docs src DRIVER = Makefile.driver TEST = test @@ -17,4 +17,7 @@ rm -f docs include src rm Makefile + +docs: + ln -sf linux/Documentation docs src: |
|
From: Richard R. <fl...@us...> - 2001-06-16 22:01:00
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/dynamic-disk/linux/Documentation In directory usw-pr-cvs1:/tmp/cvs-serv27588/Documentation Log Message: Directory /cvsroot/linux-ntfs/dynamic-disk/linux/Documentation added to the repository |
|
From: Anton A. <an...@us...> - 2001-06-16 19:59:55
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv8922/ntfstools
Modified Files:
dumplog.c ntfsdump_logfile.c
Log Message:
Update ntfsdump_logfile and dumplog and the relevant textfiles.
Index: dumplog.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/dumplog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- dumplog.c 2001/06/16 00:06:17 1.2
+++ dumplog.c 2001/06/16 19:59:51 1.3
@@ -36,4 +36,5 @@
#include <errno.h>
#include <string.h>
+#include <sys/stat.h>
#include "types.h"
@@ -55,4 +56,5 @@
int f = 0;
char zero[4096];
+ struct stat sbuf;
memset(zero, 0, sizeof(zero));
@@ -72,9 +74,18 @@
/* Generic part ends here. */
"Syntax: dumplog log_file_name\n"
- " e.g. dumplog log_file_copy\n\n",
+ " e.g. dumplog /mnt/ntfstest/\\$LogFile\n\n",
EXEC_NAME, EXEC_VERSION, EXEC_NAME, EXEC_NAME);
fprintf(stderr, "Error: incorrect syntax\n");
exit(1);
}
+ if (stat(argv[1], &sbuf) == -1) {
+ if (errno == ENOENT)
+ fprintf(stderr, "The file doesn't exist; did you "
+ "specify it correctly?\n");
+ else
+ fprintf(stderr, "Error getting information about %s: "
+ "%s\n", argv[1], strerror(errno));
+ exit(1);
+ }
f = open(argv[1], O_RDONLY);
if (f == -1) {
@@ -82,6 +93,10 @@
exit(1);
}
- l = (__s64)(0x5000);
- printf("Only analysing the first 0x%Lx bytes of the logfile.\n", l);
+ l = sbuf.st_size;
+ if (l > 0x400000LL) {
+ printf("Only analysing the first four megabytes of the "
+ "logfile.\n", l);
+ l = 0x400000LL;
+ }
lfd = (unsigned char*)calloc(1, l);
if (!lfd) {
@@ -284,5 +299,5 @@
end_of_rcrd_passes:
log_file_error:
- ("\n");
+ printf("\n");
/* Set return code to 0. */
i = 0;
Index: ntfsdump_logfile.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsdump_logfile.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- ntfsdump_logfile.c 2001/06/16 00:06:17 1.10
+++ ntfsdump_logfile.c 2001/06/16 19:59:51 1.11
@@ -1,4 +1,4 @@
const char *EXEC_NAME = "NtfsDump_LogFile";
-const char *EXEC_VERSION = "0.9";
+const char *EXEC_VERSION = "1.0";
/*
* $Id$
@@ -65,14 +65,18 @@
ATTR_RECORD *a;
__s64 l;
- unsigned char *lfd;
+ unsigned char *lfd = NULL;
ntfs_volume *vol = NULL;
RESTART_PAGE_HEADER *rph;
RESTART_AREA *rr;
RESTART_CLIENT *cr;
+ RECORD_PAGE_HEADER *rcrd_ph;
+ LOG_RECORD *lr;
int pass = 1;
- int i, lps;
+ int i, lps, client;
MFT_REF mref;
attr_search_context ctx;
+ char zero[4096];
+ memset(zero, 0, sizeof(zero));
printf("\n");
if (argc != 2) {
@@ -164,5 +168,4 @@
else
puts("$LogFile is empty.");
- free(lfd);
goto log_file_error;
}
@@ -175,7 +178,11 @@
puts("$LogFile incomplete multi sector transfer detected! "
"Cannot handle this yet!");
- free(lfd);
goto log_file_error;
}
+ if ((pass == 2) && !memcmp(lfd, rph, lps)) {
+ printf("2nd restart area fully matches the 1st one. Skipping "
+ "display.\n");
+ goto skip_rstr_pass;
+ }
if (le16_to_cpu(rph->major_ver != 1) ||
le16_to_cpu(rph->minor_ver != 1)) {
@@ -184,18 +191,18 @@
le16_to_cpu(rph->major_ver),
le16_to_cpu(rph->minor_ver));
- free(lfd);
goto log_file_error;
}
rr = (RESTART_AREA*)((char*)rph + le16_to_cpu(rph->restart_offset));
- cr = (RESTART_CLIENT*)((char*)rr + sizeof(RESTART_AREA));
+ cr = (RESTART_CLIENT*)((char*)rr +
+ le16_to_cpu(rr->client_array_offset));
/* Dump of the interpreted $LogFile restart area. */
if (pass == 1)
printf("\n$LogFile version %i.%i.\n",
- le16_to_cpu(rph->major_ver),
- le16_to_cpu(rph->minor_ver));
- printf("%s restart area:\n", pass == 1? "1st": "2nd");
+ le16_to_cpu(rph->major_ver),
+ le16_to_cpu(rph->minor_ver));
+ printf("\n%s restart area:\n", pass == 1? "1st": "2nd");
printf("magic = RSTR\n");
- printf("Lsn = 0x%Lx\n", sle64_to_cpu(rph->chkdsk_lsn));
- printf("SystempageSize = %u\n", le32_to_cpu(rph->system_page_size));
+ printf("ChkDskLsn = 0x%Lx\n", sle64_to_cpu(rph->chkdsk_lsn));
+ printf("SystemPageSize = %u\n", le32_to_cpu(rph->system_page_size));
printf("LogPageSize = %u\n", le32_to_cpu(rph->log_page_size));
printf("RestartOffset = 0x%x\n", le16_to_cpu(rph->restart_offset));
@@ -203,47 +210,140 @@
printf("CurrentLsn = %Lx\n", sle64_to_cpu(rr->current_lsn));
printf("LogClients = %u\n", le16_to_cpu(rr->log_clients));
- printf("ClientFreeList = %u\n", le16_to_cpu(rr->client_free_list));
- printf("ClientInUseList = %u\n", le16_to_cpu(rr->client_in_use_list));
+ printf("ClientFreeList = %i\n", sle16_to_cpu(rr->client_free_list));
+ printf("ClientInUseList = %i\n", sle16_to_cpu(rr->client_in_use_list));
printf("Flags = 0x%x\n", le16_to_cpu(rr->flags));
- printf("SeqNumberBits = %u\n", le32_to_cpu(rr->seq_number_bits));
+ printf("SeqNumberBits = %u (0x%x)\n", le32_to_cpu(rr->seq_number_bits),
+ le32_to_cpu(rr->seq_number_bits));
printf("RestartAreaLength = 0x%x\n",
- le16_to_cpu(rr->restart_area_length));
+ le16_to_cpu(rr->restart_area_length));
printf("ClientArrayOffset = 0x%x\n",
- le16_to_cpu(rr->client_array_offset));
- printf("FileSize = %Lu\n", le64_to_cpu(rr->file_size));
+ le16_to_cpu(rr->client_array_offset));
+ printf("FileSize = %Lu (0x%Lx)\n", le64_to_cpu(rr->file_size),
+ le64_to_cpu(rr->file_size));
if (le64_to_cpu(rr->file_size) != l)
puts("$LogFile restart area indicates a log file size"
"different from the actual size!");
printf("LastLsnDataLength = 0x%x\n",
- le32_to_cpu(rr->last_lsn_data_length));
+ le32_to_cpu(rr->last_lsn_data_length));
printf("RecordLength = 0x%x\n", le16_to_cpu(rr->record_length));
printf("LogPageDataOffset = 0x%x\n",
- le16_to_cpu(rr->log_page_data_offset));
- printf("\n1st Client record:\n");
- printf("OldestLsn = 0x%Lx\n", sle64_to_cpu(cr->oldest_lsn));
- printf("ClientRestartLsn = 0x%Lx\n",
- sle64_to_cpu(cr->client_restart_lsn));
- printf("PrevClient = 0x%x\n", le16_to_cpu(cr->prev_client));
- printf("NextClient = 0x%x\n", le16_to_cpu(cr->next_client));
- printf("SeqNumber = 0x%x\n", le16_to_cpu(cr->seq_number));
- //printf("ClientName = %u\n", le16_to_cpu(cr->client_name));
- printf("\nTerminator = 0x%x\n", *(__u32*)((char*)cr +
- sizeof(RESTART_CLIENT)));
- if (*(__u32*)((char*)cr + sizeof(RESTART_CLIENT)) != 0xffffffff)
- puts("$LogFile restart area is not terminated!");
- printf("Unicode string \"NTFS\"%spresent\n", *(__u64*)((char*)cr +
- sizeof(RESTART_CLIENT) + 0x10) ==
- cpu_to_le64(0x005300460054004e) ? " ": " not ");
- rph = (RESTART_PAGE_HEADER*)((char*)rph + lps);
+ le16_to_cpu(rr->log_page_data_offset));
+ for (client = 0; client < le16_to_cpu(rr->log_clients); client++) {
+ printf("\nRestart client record number %i:\n", client);
+ printf("OldestLsn = 0x%Lx\n", sle64_to_cpu(cr->oldest_lsn));
+ printf("ClientRestartLsn = 0x%Lx\n",
+ sle64_to_cpu(cr->client_restart_lsn));
+ printf("PrevClient = %i\n", sle16_to_cpu(cr->prev_client));
+ printf("NextClient = %i\n", sle16_to_cpu(cr->next_client));
+ printf("SeqNumber = 0x%Lx\n", le64_to_cpu(cr->seq_number));
+ printf("ClientNameLength = 0x%x\n",
+ le32_to_cpu(cr->client_name_length));
+ if (le32_to_cpu(cr->client_name_length)) {
+ // convert to ascii and print out.
+ // printf("ClientName = %u\n", le16_to_cpu(cr->client_name));
+ }
+ /* Size of a restart client record is fixed at 0xa0 bytes. */
+ cr = (RESTART_CLIENT*)((char*)cr + 0xa0);
+ }
+skip_rstr_pass:
if (pass == 1) {
+ rph = (RESTART_PAGE_HEADER*)((char*)rph + lps);
++pass;
goto pass_loc;
}
- if (!is_rcrd_recordp(rph))
- puts("$LogFile's first record area magic RCRD is missing!");
- puts("That's all for now. Dumping of the actual log contents is not "
- "implemented yet.");
- /* Release the allocated buffer. */
- free(lfd);
+ rcrd_ph = (RECORD_PAGE_HEADER*)rph;
+ /* Reuse pass for log record clienter. */
+ pass = 0;
+ printf("\nFinished with restart area. Beginning with log area.\n");
+rcrd_pass_loc:
+ rcrd_ph = (RECORD_PAGE_HEADER*)((char*)rcrd_ph + lps);
+ if ((char*)rcrd_ph + lps > (char*)lfd + l)
+ goto end_of_rcrd_passes;
+ printf("\nLog record page number %i", pass);
+ if (!is_rcrd_recordp(rcrd_ph)) {
+ for (i = 0; i < lps; i++)
+ if (((char*)rcrd_ph)[i] != (char)-1)
+ break;
+ if (i < lps)
+ puts(" is corrupt (magic RCRD is missing).");
+ else
+ puts(" is empty.");
+ pass++;
+ goto rcrd_pass_loc;
+ } else
+ printf(":");
+ /* Dump log record page */
+ printf("\nmagic = RCRD\n");
+ printf("copy.last_lsn/file_offset = 0x%Lx\n",
+ le64_to_cpu(rcrd_ph->copy.last_lsn));
+ printf("flags = 0x%x\n", le32_to_cpu(rcrd_ph->flags));
+ printf("page count = %i\n", le16_to_cpu(rcrd_ph->page_count));
+ printf("page position = %i\n", le16_to_cpu(rcrd_ph->page_position));
+ printf("header.next_record_offset = 0x%Lx\n",
+ le64_to_cpu(rcrd_ph->header.packed.next_record_offset));
+ printf("header.last_end_lsn = 0x%Lx\n",
+ le64_to_cpu(rcrd_ph->header.packed.last_end_lsn));
+ /*
+ * Where does the 0x40 come from? Is it just usa_offset +
+ * usa_client * 2 + 7 & ~7 or is it derived from somewhere?
+ */
+ lr = (LOG_RECORD*)((char*)rcrd_ph + 0x40);
+ client = 0;
+log_record_pass:
+ printf("\nLog record %i:\n", client);
+ printf("this lsn = 0x%Lx\n", le64_to_cpu(lr->this_lsn));
+ printf("client previous lsn = 0x%Lx\n",
+ le64_to_cpu(lr->client_previous_lsn));
+ printf("client undo next lsn = 0x%Lx\n",
+ le64_to_cpu(lr->client_undo_next_lsn));
+ printf("client data length = 0x%x\n",
+ le32_to_cpu(lr->client_data_length));
+ printf("client_id.seq_number = 0x%x\n",
+ le16_to_cpu(lr->client_id.seq_number));
+ printf("client_id.client_index = 0x%x\n",
+ le16_to_cpu(lr->client_id.client_index));
+ printf("record type = 0x%x\n", le32_to_cpu(lr->record_type));
+ printf("transaction_id = 0x%x\n", le32_to_cpu(lr->transaction_id));
+ printf("flags = 0x%x:", lr->flags);
+ if (!lr->flags)
+ printf(" NONE\n");
+ else {
+ int _b = 0;
+
+ if (lr->flags & LOG_RECORD_MULTI_PAGE) {
+ printf(" LOG_RECORD_MULTI_PAGE");
+ _b = 1;
+ }
+ if (lr->flags & ~LOG_RECORD_MULTI_PAGE) {
+ if (_b)
+ printf(" |");
+ printf(" Unknown flags");
+ }
+ printf("\n");
+ }
+ printf("redo_operation = 0x%x\n", le16_to_cpu(lr->redo_operation));
+ printf("undo_operation = 0x%x\n", le16_to_cpu(lr->undo_operation));
+ printf("redo_offset = 0x%x\n", le16_to_cpu(lr->redo_offset));
+ printf("redo_length = 0x%x\n", le16_to_cpu(lr->redo_length));
+ printf("undo_offset = 0x%x\n", le16_to_cpu(lr->undo_offset));
+ printf("undo_length = 0x%x\n", le16_to_cpu(lr->undo_length));
+ printf("target_attribute = 0x%x\n", le16_to_cpu(lr->target_attribute));
+ printf("lcns_to_follow = 0x%x\n", le16_to_cpu(lr->lcns_to_follow));
+ printf("record_offset = 0x%x\n", le16_to_cpu(lr->record_offset));
+ printf("attribute_offset = 0x%x\n", le16_to_cpu(lr->attribute_offset));
+ printf("target_vcn = 0x%Lx\n", sle64_to_cpu(lr->target_vcn));
+ if (le16_to_cpu(lr->lcns_to_follow) > 0)
+ printf("Array of lcns:\n");
+ for (i = 0; i < le16_to_cpu(lr->lcns_to_follow); i++)
+ printf("lcn_list[%i].lcn = 0x%Lx\n",
+ sle64_to_cpu(lr->lcn_list[i].lcn));
+ client++;
+ lr = (LOG_RECORD*)((char*)lr + 0x70);
+ if (((char*)lr + 0x70 <= (char*)rcrd_ph +
+ le64_to_cpu(rcrd_ph->header.packed.next_record_offset)))
+ goto log_record_pass;
+ pass++;
+ goto rcrd_pass_loc;
+end_of_rcrd_passes:
log_file_error:
printf("\n");
@@ -251,4 +351,6 @@
i = 0;
final_exit:
+ if (lfd)
+ free(lfd);
if (m)
free(m);
|
|
From: Anton A. <an...@us...> - 2001-06-16 19:59:55
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs In directory usw-pr-cvs1:/tmp/cvs-serv8922 Modified Files: NEWS README linux-ntfs.spec.in Log Message: Update ntfsdump_logfile and dumplog and the relevant textfiles. Index: NEWS =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/NEWS,v retrieving revision 1.5 retrieving revision 1.6 diff -U2 -r1.5 -r1.6 --- NEWS 2001/06/11 04:02:08 1.5 +++ NEWS 2001/06/16 19:59:51 1.6 @@ -12,4 +12,10 @@ Probably now require gcc 2.95 or above. (Unverified) +Updated ntfsdump_logfile to really dump the whole logfile with all the current +knowledge about the structures. Also added dumplog which does the same but +operates on a file rather than a partirion, i.e. it can operate on a live +mounted NTFS partition under linux when the -o show_sys_files was used on mount. +(Note this mount option first appears in Linux kernel 2.4.4-ac18.) + Old news ======== Index: README =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/README,v retrieving revision 1.7 retrieving revision 1.8 diff -U2 -r1.7 -r1.8 --- README 2001/06/16 19:23:39 1.7 +++ README 2001/06/16 19:59:51 1.8 @@ -62,6 +62,9 @@ for command line options. -NtfsDump_LogFile v0.9 - Interpret and display information about the journal +NtfsDump_LogFile v1.0 - Interpret and display information about the journal ($LogFile) of an NTFS volume. + +dumplog v1.0. - As NtfsDump_LogFile but operates on a file rather than a +partition, so can use it on a live mounted file system. ldm v1.3 - Interpret and display the Logical Disk Manager database (of a Index: linux-ntfs.spec.in =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/linux-ntfs.spec.in,v retrieving revision 1.8 retrieving revision 1.9 diff -U2 -r1.8 -r1.9 --- linux-ntfs.spec.in 2001/06/16 19:23:39 1.8 +++ linux-ntfs.spec.in 2001/06/16 19:59:51 1.9 @@ -28,6 +28,8 @@ mkntfs v1.39 - Format a partition with the NTFS filesystem. See man 8 mkntfs for command line options. - NtfsDump_LogFile v0.9 - Interpret and display information about the + NtfsDump_LogFile v1.0 - Interpret and display information about the journal ($LogFile) of an NTFS volume. + dumplog v1.0. - As NtfsDump_LogFile but operates on a file rather than a +partition, so can use it on a live mounted file system. ldm v1.3 - Interpret and display the Logical Disk Manager database (of a Windows 2000/XP dynamic disk/block device). |
|
From: Anton A. <an...@us...> - 2001-06-16 19:23:42
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs In directory usw-pr-cvs1:/tmp/cvs-serv3774 Modified Files: README linux-ntfs.spec.in Log Message: Version number update Index: README =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/README,v retrieving revision 1.6 retrieving revision 1.7 diff -U2 -r1.6 -r1.7 --- README 2001/06/16 19:22:45 1.6 +++ README 2001/06/16 19:23:39 1.7 @@ -59,5 +59,5 @@ rebooting into Windows NT/2000 or you *will* suffer! - You have been warned! -mkntfs v1.37 - Format a partition with the NTFS filesystem. See man 8 mkntfs +mkntfs v1.39 - Format a partition with the NTFS filesystem. See man 8 mkntfs for command line options. Index: linux-ntfs.spec.in =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/linux-ntfs.spec.in,v retrieving revision 1.7 retrieving revision 1.8 diff -U2 -r1.7 -r1.8 --- linux-ntfs.spec.in 2001/06/16 19:22:45 1.7 +++ linux-ntfs.spec.in 2001/06/16 19:23:39 1.8 @@ -26,5 +26,5 @@ IMPORTANT: Run this only *after* unmounting the partition in Linux but *before* rebooting into Windows NT/2000! - mkntfs v1.37 - Format a partition with the NTFS filesystem. See man 8 + mkntfs v1.39 - Format a partition with the NTFS filesystem. See man 8 mkntfs for command line options. NtfsDump_LogFile v0.9 - Interpret and display information about the |
|
From: Anton A. <an...@us...> - 2001-06-16 19:22:47
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools In directory usw-pr-cvs1:/tmp/cvs-serv3545/ntfstools Modified Files: Makefile.am Makefile.in mkntfs.c Removed Files: logfile.c Log Message: Get rid of logfile stuff for mkntfs as it is clearly not needed. Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -U2 -r1.9 -r1.10 --- Makefile.am 2001/06/15 16:47:47 1.9 +++ Makefile.am 2001/06/16 19:22:45 1.10 @@ -22,5 +22,5 @@ ntfsdump_logfile_LDFLAGS= $(all_libraries) -mkntfs_SOURCES = attrdef.c upcase.c boot.c sd.c logfile.c mkntfs.c +mkntfs_SOURCES = attrdef.c upcase.c boot.c sd.c mkntfs.c mkntfs_LDADD = $(top_srcdir)/libntfs/libntfs.la mkntfs_LDFLAGS = $(all_libraries) Index: Makefile.in =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.in,v retrieving revision 1.9 retrieving revision 1.10 diff -U2 -r1.9 -r1.10 --- Makefile.in 2001/06/15 16:47:47 1.9 +++ Makefile.in 2001/06/16 19:22:45 1.10 @@ -108,5 +108,5 @@ ntfsdump_logfile_LDFLAGS = $(all_libraries) -mkntfs_SOURCES = attrdef.c upcase.c boot.c sd.c logfile.c mkntfs.c +mkntfs_SOURCES = attrdef.c upcase.c boot.c sd.c mkntfs.c mkntfs_LDADD = $(top_srcdir)/libntfs/libntfs.la mkntfs_LDFLAGS = $(all_libraries) @@ -132,5 +132,5 @@ ntfsdump_logfile_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la mkntfs_OBJECTS = attrdef.$(OBJEXT) upcase.$(OBJEXT) boot.$(OBJEXT) \ -sd.$(OBJEXT) logfile.$(OBJEXT) mkntfs.$(OBJEXT) +sd.$(OBJEXT) mkntfs.$(OBJEXT) mkntfs_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la ldm_OBJECTS = ldm.$(OBJEXT) @@ -156,6 +156,6 @@ GZIP_ENV = --best DEP_FILES = .deps/attrdef.P .deps/boot.P .deps/dumplog.P .deps/ldm.P \ -.deps/logfile.P .deps/mkntfs.P .deps/ntfsdump_logfile.P .deps/ntfsfix.P \ -.deps/sd.P .deps/upcase.P +.deps/mkntfs.P .deps/ntfsdump_logfile.P .deps/ntfsfix.P .deps/sd.P \ +.deps/upcase.P SOURCES = $(ntfsfix_SOURCES) $(ntfsdump_logfile_SOURCES) $(mkntfs_SOURCES) $(ldm_SOURCES) $(dumplog_SOURCES) OBJECTS = $(ntfsfix_OBJECTS) $(ntfsdump_logfile_OBJECTS) $(mkntfs_OBJECTS) $(ldm_OBJECTS) $(dumplog_OBJECTS) Index: mkntfs.c =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v retrieving revision 1.38 retrieving revision 1.39 diff -U2 -r1.38 -r1.39 --- mkntfs.c 2001/06/16 18:26:34 1.38 +++ mkntfs.c 2001/06/16 19:22:45 1.39 @@ -105,5 +105,4 @@ int *sd_val_len); extern void init_upcase_table(uchar_t *uc, __u32 uc_len); -extern void init_logfile(char *log_buf, __u32 log_buf_size); #define BLKGETSIZE _IO(0x12,96) @@ -3162,5 +3161,4 @@ strerror(errno)); memset(buf2, -1, opt.logfile_size); - init_logfile(buf2, opt.logfile_size); err = add_attr_data_positioned(m, NULL, 0, 0, NULL, 0, 0, rl_logfile, buf2, opt.logfile_size); --- logfile.c DELETED --- |
