LDM bugfix - 2.4.13-ac5
PATCH 1/1 LDM bugfix - 2.4.13-ac5
Hi Alan,
Please can you apply this patch to 2.4.13-ac5. It fixes a minor mistake when reading the LDM database.
Cheers,
FlatCap (Rich)
[email protected]
fs/partitions/ldm.c +5 -2
@@ -1,7 +1,7 @@/* * ldm - Part of the Linux-NTFS project. * -* Copyright (C) 2001 Richard Russon <[email protected]> +* Copyright (C) 2001 Richard Russon <[email protected]> * Copyright (C) 2001 Anton Altaparmakov <[email protected]> (AIA) * * Documentation is available at http://linux-ntfs.sf.net/ldm
@@ -453,7 +453,10 @@ delta = vblk * vsize +0x18 ;if (delta >=512 ) goto brelse_out; -if (block[0x13 ] !=VBLK_DISK ) +if (block[0x0D ] !=0 )/* Extended VBLK, ignore */ +continue ; +if ((block[0x13 ] !=VBLK_DSK1 ) && + (block[0x13 ] !=VBLK_DSK2 ))continue ;/* Calculate relative offsets. */ rel_objid =1 + block[0x18 ];
fs/partitions/ldm.h +6 -6
@@ -1,11 +1,9 @@#ifndef _FS_PT_LDM_H_#define _FS_PT_LDM_H_/* -* $Id: ldm.h,v 1.13 2001/07/23 19:49:49 antona Exp $ -* * ldm - Part of the Linux-NTFS project. * -* Copyright (C) 2001 Richard Russon <[email protected]> +* Copyright (C) 2001 Richard Russon <[email protected]> * Copyright (C) 2001 Anton Altaparmakov <[email protected]> * * Documentation is available at http://linux-ntfs.sf.net/ldm
@@ -25,7 +23,7 @@* in the file COPYING); if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <asm/types.h> +#include <linux/types.h> #include <asm/unaligned.h> #include <asm/byteorder.h> #include <linux/genhd.h>
@@ -45,8 +43,10 @@/* The defined vblk types. */ #define VBLK_COMP 0x32/* Component */ #define VBLK_PART 0x33/* Partition */ -#define VBLK_DISK 0x34/* Disk */ -#define VBLK_DGRP 0x45/* Disk Group */ +#define VBLK_DSK1 0x34/* Disk */ +#define VBLK_DSK2 0x44/* Disk */ +#define VBLK_DGR1 0x35/* Disk Group */ +#define VBLK_DGR2 0x45/* Disk Group */ #define VBLK_VOLU 0x51/* Volume */ /* Other constants. */