git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
mtd
/
nftlmount.c
diff --git
a/drivers/mtd/nftlmount.c
b/drivers/mtd/nftlmount.c
index
eee7faa
..
84afd90
100644
(file)
--- a/
drivers/mtd/nftlmount.c
+++ b/
drivers/mtd/nftlmount.c
@@
-4,7
+4,7
@@
* Author: Fabrice Bellard (fabrice.bellard@netgem.com)
* Copyright (C) 2000 Netgem S.A.
*
* Author: Fabrice Bellard (fabrice.bellard@netgem.com)
* Copyright (C) 2000 Netgem S.A.
*
- * $Id: nftlmount.c,v 1.
36 2004/06/28 13:52:55 dbrown
Exp $
+ * $Id: nftlmount.c,v 1.
40 2004/11/22 14:38:29 kalev
Exp $
*
* 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
*
* 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
@@
-31,7
+31,7
@@
#define SECTORSIZE 512
#define SECTORSIZE 512
-char nftlmountrev[]="$Revision: 1.
36
$";
+char nftlmountrev[]="$Revision: 1.
40
$";
/* find_boot_record: Find the NFTL Media Header and its Spare copy which contains the
* various device information of the NFTL partition and Bad Unit Table. Update
/* find_boot_record: Find the NFTL Media Header and its Spare copy which contains the
* various device information of the NFTL partition and Bad Unit Table. Update
@@
-41,7
+41,6
@@
char nftlmountrev[]="$Revision: 1.36 $";
static int find_boot_record(struct NFTLrecord *nftl)
{
struct nftl_uci1 h1;
static int find_boot_record(struct NFTLrecord *nftl)
{
struct nftl_uci1 h1;
- struct nftl_oob oob;
unsigned int block, boot_record_count = 0;
size_t retlen;
u8 buf[SECTORSIZE];
unsigned int block, boot_record_count = 0;
size_t retlen;
u8 buf[SECTORSIZE];
@@
-319,6
+318,7
@@
int NFTL_formatblock(struct NFTLrecord *nftl, int block)
memset(instr, 0, sizeof(struct erase_info));
/* XXX: use async erase interface, XXX: test return code */
memset(instr, 0, sizeof(struct erase_info));
/* XXX: use async erase interface, XXX: test return code */
+ instr->mtd = nftl->mbd.mtd;
instr->addr = block * nftl->EraseSize;
instr->len = nftl->EraseSize;
MTD_ERASE(nftl->mbd.mtd, instr);
instr->addr = block * nftl->EraseSize;
instr->len = nftl->EraseSize;
MTD_ERASE(nftl->mbd.mtd, instr);