Commit 0b69760b authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Linus Torvalds

HPFS: Fix endianity. Make hpfs work on big-endian machines

Fix endianity. Make hpfs work on big-endian machines.
Signed-off-by: default avatarMikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bc8728ee
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
static int chk_if_allocated(struct super_block *s, secno sec, char *msg) static int chk_if_allocated(struct super_block *s, secno sec, char *msg)
{ {
struct quad_buffer_head qbh; struct quad_buffer_head qbh;
unsigned *bmp; u32 *bmp;
if (!(bmp = hpfs_map_bitmap(s, sec >> 14, &qbh, "chk"))) goto fail; if (!(bmp = hpfs_map_bitmap(s, sec >> 14, &qbh, "chk"))) goto fail;
if ((bmp[(sec & 0x3fff) >> 5] >> (sec & 0x1f)) & 1) { if ((cpu_to_le32(bmp[(sec & 0x3fff) >> 5]) >> (sec & 0x1f)) & 1) {
hpfs_error(s, "sector '%s' - %08x not allocated in bitmap", msg, sec); hpfs_error(s, "sector '%s' - %08x not allocated in bitmap", msg, sec);
goto fail1; goto fail1;
} }
...@@ -26,7 +26,7 @@ static int chk_if_allocated(struct super_block *s, secno sec, char *msg) ...@@ -26,7 +26,7 @@ static int chk_if_allocated(struct super_block *s, secno sec, char *msg)
if (sec >= hpfs_sb(s)->sb_dirband_start && sec < hpfs_sb(s)->sb_dirband_start + hpfs_sb(s)->sb_dirband_size) { if (sec >= hpfs_sb(s)->sb_dirband_start && sec < hpfs_sb(s)->sb_dirband_start + hpfs_sb(s)->sb_dirband_size) {
unsigned ssec = (sec - hpfs_sb(s)->sb_dirband_start) / 4; unsigned ssec = (sec - hpfs_sb(s)->sb_dirband_start) / 4;
if (!(bmp = hpfs_map_dnode_bitmap(s, &qbh))) goto fail; if (!(bmp = hpfs_map_dnode_bitmap(s, &qbh))) goto fail;
if ((bmp[ssec >> 5] >> (ssec & 0x1f)) & 1) { if ((le32_to_cpu(bmp[ssec >> 5]) >> (ssec & 0x1f)) & 1) {
hpfs_error(s, "sector '%s' - %08x not allocated in directory bitmap", msg, sec); hpfs_error(s, "sector '%s' - %08x not allocated in directory bitmap", msg, sec);
goto fail1; goto fail1;
} }
...@@ -82,10 +82,6 @@ static secno alloc_in_bmp(struct super_block *s, secno near, unsigned n, unsigne ...@@ -82,10 +82,6 @@ static secno alloc_in_bmp(struct super_block *s, secno near, unsigned n, unsigne
ret = bs + nr; ret = bs + nr;
goto rt; goto rt;
} }
/*if (!tstbits(bmp, nr + n, n + forward)) {
ret = bs + nr + n;
goto rt;
}*/
q = nr + n; b = 0; q = nr + n; b = 0;
while ((a = tstbits(bmp, q, n + forward)) != 0) { while ((a = tstbits(bmp, q, n + forward)) != 0) {
q += a; q += a;
...@@ -102,14 +98,14 @@ static secno alloc_in_bmp(struct super_block *s, secno near, unsigned n, unsigne ...@@ -102,14 +98,14 @@ static secno alloc_in_bmp(struct super_block *s, secno near, unsigned n, unsigne
goto rt; goto rt;
} }
nr >>= 5; nr >>= 5;
/*for (i = nr + 1; i != nr; i++, i &= 0x1ff) {*/ /*for (i = nr + 1; i != nr; i++, i &= 0x1ff) */
i = nr; i = nr;
do { do {
if (!bmp[i]) goto cont; if (!le32_to_cpu(bmp[i])) goto cont;
if (n + forward >= 0x3f && bmp[i] != -1) goto cont; if (n + forward >= 0x3f && le32_to_cpu(bmp[i]) != 0xffffffff) goto cont;
q = i<<5; q = i<<5;
if (i > 0) { if (i > 0) {
unsigned k = bmp[i-1]; unsigned k = le32_to_cpu(bmp[i-1]);
while (k & 0x80000000) { while (k & 0x80000000) {
q--; k <<= 1; q--; k <<= 1;
} }
...@@ -129,12 +125,12 @@ static secno alloc_in_bmp(struct super_block *s, secno near, unsigned n, unsigne ...@@ -129,12 +125,12 @@ static secno alloc_in_bmp(struct super_block *s, secno near, unsigned n, unsigne
} while (i != nr); } while (i != nr);
rt: rt:
if (ret) { if (ret) {
if (hpfs_sb(s)->sb_chk && ((ret >> 14) != (bs >> 14) || (bmp[(ret & 0x3fff) >> 5] | ~(((1 << n) - 1) << (ret & 0x1f))) != 0xffffffff)) { if (hpfs_sb(s)->sb_chk && ((ret >> 14) != (bs >> 14) || (le32_to_cpu(bmp[(ret & 0x3fff) >> 5]) | ~(((1 << n) - 1) << (ret & 0x1f))) != 0xffffffff)) {
hpfs_error(s, "Allocation doesn't work! Wanted %d, allocated at %08x", n, ret); hpfs_error(s, "Allocation doesn't work! Wanted %d, allocated at %08x", n, ret);
ret = 0; ret = 0;
goto b; goto b;
} }
bmp[(ret & 0x3fff) >> 5] &= ~(((1 << n) - 1) << (ret & 0x1f)); bmp[(ret & 0x3fff) >> 5] &= cpu_to_le32(~(((1 << n) - 1) << (ret & 0x1f)));
hpfs_mark_4buffers_dirty(&qbh); hpfs_mark_4buffers_dirty(&qbh);
} }
b: b:
...@@ -240,10 +236,10 @@ static secno alloc_in_dirband(struct super_block *s, secno near) ...@@ -240,10 +236,10 @@ static secno alloc_in_dirband(struct super_block *s, secno near)
int hpfs_alloc_if_possible(struct super_block *s, secno sec) int hpfs_alloc_if_possible(struct super_block *s, secno sec)
{ {
struct quad_buffer_head qbh; struct quad_buffer_head qbh;
unsigned *bmp; u32 *bmp;
if (!(bmp = hpfs_map_bitmap(s, sec >> 14, &qbh, "aip"))) goto end; if (!(bmp = hpfs_map_bitmap(s, sec >> 14, &qbh, "aip"))) goto end;
if (bmp[(sec & 0x3fff) >> 5] & (1 << (sec & 0x1f))) { if (le32_to_cpu(bmp[(sec & 0x3fff) >> 5]) & (1 << (sec & 0x1f))) {
bmp[(sec & 0x3fff) >> 5] &= ~(1 << (sec & 0x1f)); bmp[(sec & 0x3fff) >> 5] &= cpu_to_le32(~(1 << (sec & 0x1f)));
hpfs_mark_4buffers_dirty(&qbh); hpfs_mark_4buffers_dirty(&qbh);
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
return 1; return 1;
...@@ -258,7 +254,7 @@ int hpfs_alloc_if_possible(struct super_block *s, secno sec) ...@@ -258,7 +254,7 @@ int hpfs_alloc_if_possible(struct super_block *s, secno sec)
void hpfs_free_sectors(struct super_block *s, secno sec, unsigned n) void hpfs_free_sectors(struct super_block *s, secno sec, unsigned n)
{ {
struct quad_buffer_head qbh; struct quad_buffer_head qbh;
unsigned *bmp; u32 *bmp;
struct hpfs_sb_info *sbi = hpfs_sb(s); struct hpfs_sb_info *sbi = hpfs_sb(s);
/*printk("2 - ");*/ /*printk("2 - ");*/
if (!n) return; if (!n) return;
...@@ -273,12 +269,12 @@ void hpfs_free_sectors(struct super_block *s, secno sec, unsigned n) ...@@ -273,12 +269,12 @@ void hpfs_free_sectors(struct super_block *s, secno sec, unsigned n)
return; return;
} }
new_tst: new_tst:
if ((bmp[(sec & 0x3fff) >> 5] >> (sec & 0x1f) & 1)) { if ((le32_to_cpu(bmp[(sec & 0x3fff) >> 5]) >> (sec & 0x1f) & 1)) {
hpfs_error(s, "sector %08x not allocated", sec); hpfs_error(s, "sector %08x not allocated", sec);
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
return; return;
} }
bmp[(sec & 0x3fff) >> 5] |= 1 << (sec & 0x1f); bmp[(sec & 0x3fff) >> 5] |= cpu_to_le32(1 << (sec & 0x1f));
if (!--n) { if (!--n) {
hpfs_mark_4buffers_dirty(&qbh); hpfs_mark_4buffers_dirty(&qbh);
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
...@@ -303,13 +299,13 @@ int hpfs_check_free_dnodes(struct super_block *s, int n) ...@@ -303,13 +299,13 @@ int hpfs_check_free_dnodes(struct super_block *s, int n)
int n_bmps = (hpfs_sb(s)->sb_fs_size + 0x4000 - 1) >> 14; int n_bmps = (hpfs_sb(s)->sb_fs_size + 0x4000 - 1) >> 14;
int b = hpfs_sb(s)->sb_c_bitmap & 0x0fffffff; int b = hpfs_sb(s)->sb_c_bitmap & 0x0fffffff;
int i, j; int i, j;
unsigned *bmp; u32 *bmp;
struct quad_buffer_head qbh; struct quad_buffer_head qbh;
if ((bmp = hpfs_map_dnode_bitmap(s, &qbh))) { if ((bmp = hpfs_map_dnode_bitmap(s, &qbh))) {
for (j = 0; j < 512; j++) { for (j = 0; j < 512; j++) {
unsigned k; unsigned k;
if (!bmp[j]) continue; if (!le32_to_cpu(bmp[j])) continue;
for (k = bmp[j]; k; k >>= 1) if (k & 1) if (!--n) { for (k = le32_to_cpu(bmp[j]); k; k >>= 1) if (k & 1) if (!--n) {
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
return 0; return 0;
} }
...@@ -328,10 +324,10 @@ int hpfs_check_free_dnodes(struct super_block *s, int n) ...@@ -328,10 +324,10 @@ int hpfs_check_free_dnodes(struct super_block *s, int n)
chk_bmp: chk_bmp:
if (bmp) { if (bmp) {
for (j = 0; j < 512; j++) { for (j = 0; j < 512; j++) {
unsigned k; u32 k;
if (!bmp[j]) continue; if (!le32_to_cpu(bmp[j])) continue;
for (k = 0xf; k; k <<= 4) for (k = 0xf; k; k <<= 4)
if ((bmp[j] & k) == k) { if ((le32_to_cpu(bmp[j]) & k) == k) {
if (!--n) { if (!--n) {
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
return 0; return 0;
...@@ -355,12 +351,12 @@ void hpfs_free_dnode(struct super_block *s, dnode_secno dno) ...@@ -355,12 +351,12 @@ void hpfs_free_dnode(struct super_block *s, dnode_secno dno)
hpfs_free_sectors(s, dno, 4); hpfs_free_sectors(s, dno, 4);
} else { } else {
struct quad_buffer_head qbh; struct quad_buffer_head qbh;
unsigned *bmp; u32 *bmp;
unsigned ssec = (dno - hpfs_sb(s)->sb_dirband_start) / 4; unsigned ssec = (dno - hpfs_sb(s)->sb_dirband_start) / 4;
if (!(bmp = hpfs_map_dnode_bitmap(s, &qbh))) { if (!(bmp = hpfs_map_dnode_bitmap(s, &qbh))) {
return; return;
} }
bmp[ssec >> 5] |= 1 << (ssec & 0x1f); bmp[ssec >> 5] |= cpu_to_le32(1 << (ssec & 0x1f));
hpfs_mark_4buffers_dirty(&qbh); hpfs_mark_4buffers_dirty(&qbh);
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
} }
...@@ -382,13 +378,13 @@ struct dnode *hpfs_alloc_dnode(struct super_block *s, secno near, ...@@ -382,13 +378,13 @@ struct dnode *hpfs_alloc_dnode(struct super_block *s, secno near,
return NULL; return NULL;
} }
memset(d, 0, 2048); memset(d, 0, 2048);
d->magic = DNODE_MAGIC; d->magic = cpu_to_le32(DNODE_MAGIC);
d->first_free = 52; d->first_free = cpu_to_le32(52);
d->dirent[0] = 32; d->dirent[0] = 32;
d->dirent[2] = 8; d->dirent[2] = 8;
d->dirent[30] = 1; d->dirent[30] = 1;
d->dirent[31] = 255; d->dirent[31] = 255;
d->self = *dno; d->self = cpu_to_le32(*dno);
return d; return d;
} }
...@@ -402,10 +398,10 @@ struct fnode *hpfs_alloc_fnode(struct super_block *s, secno near, fnode_secno *f ...@@ -402,10 +398,10 @@ struct fnode *hpfs_alloc_fnode(struct super_block *s, secno near, fnode_secno *f
return NULL; return NULL;
} }
memset(f, 0, 512); memset(f, 0, 512);
f->magic = FNODE_MAGIC; f->magic = cpu_to_le32(FNODE_MAGIC);
f->ea_offs = 0xc4; f->ea_offs = cpu_to_le16(0xc4);
f->btree.n_free_nodes = 8; f->btree.n_free_nodes = 8;
f->btree.first_free = 8; f->btree.first_free = cpu_to_le16(8);
return f; return f;
} }
...@@ -419,10 +415,10 @@ struct anode *hpfs_alloc_anode(struct super_block *s, secno near, anode_secno *a ...@@ -419,10 +415,10 @@ struct anode *hpfs_alloc_anode(struct super_block *s, secno near, anode_secno *a
return NULL; return NULL;
} }
memset(a, 0, 512); memset(a, 0, 512);
a->magic = ANODE_MAGIC; a->magic = cpu_to_le32(ANODE_MAGIC);
a->self = *ano; a->self = cpu_to_le32(*ano);
a->btree.n_free_nodes = 40; a->btree.n_free_nodes = 40;
a->btree.n_used_nodes = 0; a->btree.n_used_nodes = 0;
a->btree.first_free = 8; a->btree.first_free = cpu_to_le16(8);
return a; return a;
} }
...@@ -22,8 +22,8 @@ secno hpfs_bplus_lookup(struct super_block *s, struct inode *inode, ...@@ -22,8 +22,8 @@ secno hpfs_bplus_lookup(struct super_block *s, struct inode *inode,
if (hpfs_sb(s)->sb_chk) if (hpfs_stop_cycles(s, a, &c1, &c2, "hpfs_bplus_lookup")) return -1; if (hpfs_sb(s)->sb_chk) if (hpfs_stop_cycles(s, a, &c1, &c2, "hpfs_bplus_lookup")) return -1;
if (btree->internal) { if (btree->internal) {
for (i = 0; i < btree->n_used_nodes; i++) for (i = 0; i < btree->n_used_nodes; i++)
if (btree->u.internal[i].file_secno > sec) { if (le32_to_cpu(btree->u.internal[i].file_secno) > sec) {
a = btree->u.internal[i].down; a = le32_to_cpu(btree->u.internal[i].down);
brelse(bh); brelse(bh);
if (!(anode = hpfs_map_anode(s, a, &bh))) return -1; if (!(anode = hpfs_map_anode(s, a, &bh))) return -1;
btree = &anode->btree; btree = &anode->btree;
...@@ -34,18 +34,18 @@ secno hpfs_bplus_lookup(struct super_block *s, struct inode *inode, ...@@ -34,18 +34,18 @@ secno hpfs_bplus_lookup(struct super_block *s, struct inode *inode,
return -1; return -1;
} }
for (i = 0; i < btree->n_used_nodes; i++) for (i = 0; i < btree->n_used_nodes; i++)
if (btree->u.external[i].file_secno <= sec && if (le32_to_cpu(btree->u.external[i].file_secno) <= sec &&
btree->u.external[i].file_secno + btree->u.external[i].length > sec) { le32_to_cpu(btree->u.external[i].file_secno) + le32_to_cpu(btree->u.external[i].length) > sec) {
a = btree->u.external[i].disk_secno + sec - btree->u.external[i].file_secno; a = le32_to_cpu(btree->u.external[i].disk_secno) + sec - le32_to_cpu(btree->u.external[i].file_secno);
if (hpfs_sb(s)->sb_chk) if (hpfs_chk_sectors(s, a, 1, "data")) { if (hpfs_sb(s)->sb_chk) if (hpfs_chk_sectors(s, a, 1, "data")) {
brelse(bh); brelse(bh);
return -1; return -1;
} }
if (inode) { if (inode) {
struct hpfs_inode_info *hpfs_inode = hpfs_i(inode); struct hpfs_inode_info *hpfs_inode = hpfs_i(inode);
hpfs_inode->i_file_sec = btree->u.external[i].file_secno; hpfs_inode->i_file_sec = le32_to_cpu(btree->u.external[i].file_secno);
hpfs_inode->i_disk_sec = btree->u.external[i].disk_secno; hpfs_inode->i_disk_sec = le32_to_cpu(btree->u.external[i].disk_secno);
hpfs_inode->i_n_secs = btree->u.external[i].length; hpfs_inode->i_n_secs = le32_to_cpu(btree->u.external[i].length);
} }
brelse(bh); brelse(bh);
return a; return a;
...@@ -83,8 +83,8 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi ...@@ -83,8 +83,8 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi
return -1; return -1;
} }
if (btree->internal) { if (btree->internal) {
a = btree->u.internal[n].down; a = le32_to_cpu(btree->u.internal[n].down);
btree->u.internal[n].file_secno = -1; btree->u.internal[n].file_secno = cpu_to_le32(-1);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
brelse(bh); brelse(bh);
if (hpfs_sb(s)->sb_chk) if (hpfs_sb(s)->sb_chk)
...@@ -94,15 +94,15 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi ...@@ -94,15 +94,15 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi
goto go_down; goto go_down;
} }
if (n >= 0) { if (n >= 0) {
if (btree->u.external[n].file_secno + btree->u.external[n].length != fsecno) { if (le32_to_cpu(btree->u.external[n].file_secno) + le32_to_cpu(btree->u.external[n].length) != fsecno) {
hpfs_error(s, "allocated size %08x, trying to add sector %08x, %cnode %08x", hpfs_error(s, "allocated size %08x, trying to add sector %08x, %cnode %08x",
btree->u.external[n].file_secno + btree->u.external[n].length, fsecno, le32_to_cpu(btree->u.external[n].file_secno) + le32_to_cpu(btree->u.external[n].length), fsecno,
fnod?'f':'a', node); fnod?'f':'a', node);
brelse(bh); brelse(bh);
return -1; return -1;
} }
if (hpfs_alloc_if_possible(s, se = btree->u.external[n].disk_secno + btree->u.external[n].length)) { if (hpfs_alloc_if_possible(s, se = le32_to_cpu(btree->u.external[n].disk_secno) + le32_to_cpu(btree->u.external[n].length))) {
btree->u.external[n].length++; btree->u.external[n].length = cpu_to_le32(le32_to_cpu(btree->u.external[n].length) + 1);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
brelse(bh); brelse(bh);
return se; return se;
...@@ -119,16 +119,16 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi ...@@ -119,16 +119,16 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi
brelse(bh); brelse(bh);
return -1; return -1;
} }
fs = n < 0 ? 0 : btree->u.external[n].file_secno + btree->u.external[n].length; fs = n < 0 ? 0 : le32_to_cpu(btree->u.external[n].file_secno) + le32_to_cpu(btree->u.external[n].length);
if (!btree->n_free_nodes) { if (!btree->n_free_nodes) {
up = a != node ? anode->up : -1; up = a != node ? le32_to_cpu(anode->up) : -1;
if (!(anode = hpfs_alloc_anode(s, a, &na, &bh1))) { if (!(anode = hpfs_alloc_anode(s, a, &na, &bh1))) {
brelse(bh); brelse(bh);
hpfs_free_sectors(s, se, 1); hpfs_free_sectors(s, se, 1);
return -1; return -1;
} }
if (a == node && fnod) { if (a == node && fnod) {
anode->up = node; anode->up = cpu_to_le32(node);
anode->btree.fnode_parent = 1; anode->btree.fnode_parent = 1;
anode->btree.n_used_nodes = btree->n_used_nodes; anode->btree.n_used_nodes = btree->n_used_nodes;
anode->btree.first_free = btree->first_free; anode->btree.first_free = btree->first_free;
...@@ -137,9 +137,9 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi ...@@ -137,9 +137,9 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi
btree->internal = 1; btree->internal = 1;
btree->n_free_nodes = 11; btree->n_free_nodes = 11;
btree->n_used_nodes = 1; btree->n_used_nodes = 1;
btree->first_free = (char *)&(btree->u.internal[1]) - (char *)btree; btree->first_free = cpu_to_le16((char *)&(btree->u.internal[1]) - (char *)btree);
btree->u.internal[0].file_secno = -1; btree->u.internal[0].file_secno = cpu_to_le32(-1);
btree->u.internal[0].down = na; btree->u.internal[0].down = cpu_to_le32(na);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
} else if (!(ranode = hpfs_alloc_anode(s, /*a*/0, &ra, &bh2))) { } else if (!(ranode = hpfs_alloc_anode(s, /*a*/0, &ra, &bh2))) {
brelse(bh); brelse(bh);
...@@ -153,15 +153,15 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi ...@@ -153,15 +153,15 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi
btree = &anode->btree; btree = &anode->btree;
} }
btree->n_free_nodes--; n = btree->n_used_nodes++; btree->n_free_nodes--; n = btree->n_used_nodes++;
btree->first_free += 12; btree->first_free = cpu_to_le16(le16_to_cpu(btree->first_free) + 12);
btree->u.external[n].disk_secno = se; btree->u.external[n].disk_secno = cpu_to_le32(se);
btree->u.external[n].file_secno = fs; btree->u.external[n].file_secno = cpu_to_le32(fs);
btree->u.external[n].length = 1; btree->u.external[n].length = cpu_to_le32(1);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
brelse(bh); brelse(bh);
if ((a == node && fnod) || na == -1) return se; if ((a == node && fnod) || na == -1) return se;
c2 = 0; c2 = 0;
while (up != -1) { while (up != (anode_secno)-1) {
struct anode *new_anode; struct anode *new_anode;
if (hpfs_sb(s)->sb_chk) if (hpfs_sb(s)->sb_chk)
if (hpfs_stop_cycles(s, up, &c1, &c2, "hpfs_add_sector_to_btree #2")) return -1; if (hpfs_stop_cycles(s, up, &c1, &c2, "hpfs_add_sector_to_btree #2")) return -1;
...@@ -174,47 +174,47 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi ...@@ -174,47 +174,47 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi
} }
if (btree->n_free_nodes) { if (btree->n_free_nodes) {
btree->n_free_nodes--; n = btree->n_used_nodes++; btree->n_free_nodes--; n = btree->n_used_nodes++;
btree->first_free += 8; btree->first_free = cpu_to_le16(le16_to_cpu(btree->first_free) + 8);
btree->u.internal[n].file_secno = -1; btree->u.internal[n].file_secno = cpu_to_le32(-1);
btree->u.internal[n].down = na; btree->u.internal[n].down = cpu_to_le32(na);
btree->u.internal[n-1].file_secno = fs; btree->u.internal[n-1].file_secno = cpu_to_le32(fs);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
brelse(bh); brelse(bh);
brelse(bh2); brelse(bh2);
hpfs_free_sectors(s, ra, 1); hpfs_free_sectors(s, ra, 1);
if ((anode = hpfs_map_anode(s, na, &bh))) { if ((anode = hpfs_map_anode(s, na, &bh))) {
anode->up = up; anode->up = cpu_to_le32(up);
anode->btree.fnode_parent = up == node && fnod; anode->btree.fnode_parent = up == node && fnod;
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
brelse(bh); brelse(bh);
} }
return se; return se;
} }
up = up != node ? anode->up : -1; up = up != node ? le32_to_cpu(anode->up) : -1;
btree->u.internal[btree->n_used_nodes - 1].file_secno = /*fs*/-1; btree->u.internal[btree->n_used_nodes - 1].file_secno = cpu_to_le32(/*fs*/-1);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
brelse(bh); brelse(bh);
a = na; a = na;
if ((new_anode = hpfs_alloc_anode(s, a, &na, &bh))) { if ((new_anode = hpfs_alloc_anode(s, a, &na, &bh))) {
anode = new_anode; anode = new_anode;
/*anode->up = up != -1 ? up : ra;*/ /*anode->up = cpu_to_le32(up != -1 ? up : ra);*/
anode->btree.internal = 1; anode->btree.internal = 1;
anode->btree.n_used_nodes = 1; anode->btree.n_used_nodes = 1;
anode->btree.n_free_nodes = 59; anode->btree.n_free_nodes = 59;
anode->btree.first_free = 16; anode->btree.first_free = cpu_to_le16(16);
anode->btree.u.internal[0].down = a; anode->btree.u.internal[0].down = cpu_to_le32(a);
anode->btree.u.internal[0].file_secno = -1; anode->btree.u.internal[0].file_secno = cpu_to_le32(-1);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
brelse(bh); brelse(bh);
if ((anode = hpfs_map_anode(s, a, &bh))) { if ((anode = hpfs_map_anode(s, a, &bh))) {
anode->up = na; anode->up = cpu_to_le32(na);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
brelse(bh); brelse(bh);
} }
} else na = a; } else na = a;
} }
if ((anode = hpfs_map_anode(s, na, &bh))) { if ((anode = hpfs_map_anode(s, na, &bh))) {
anode->up = node; anode->up = cpu_to_le32(node);
if (fnod) anode->btree.fnode_parent = 1; if (fnod) anode->btree.fnode_parent = 1;
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
brelse(bh); brelse(bh);
...@@ -232,14 +232,14 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi ...@@ -232,14 +232,14 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi
} }
btree = &fnode->btree; btree = &fnode->btree;
} }
ranode->up = node; ranode->up = cpu_to_le32(node);
memcpy(&ranode->btree, btree, btree->first_free); memcpy(&ranode->btree, btree, le16_to_cpu(btree->first_free));
if (fnod) ranode->btree.fnode_parent = 1; if (fnod) ranode->btree.fnode_parent = 1;
ranode->btree.n_free_nodes = (ranode->btree.internal ? 60 : 40) - ranode->btree.n_used_nodes; ranode->btree.n_free_nodes = (ranode->btree.internal ? 60 : 40) - ranode->btree.n_used_nodes;
if (ranode->btree.internal) for (n = 0; n < ranode->btree.n_used_nodes; n++) { if (ranode->btree.internal) for (n = 0; n < ranode->btree.n_used_nodes; n++) {
struct anode *unode; struct anode *unode;
if ((unode = hpfs_map_anode(s, ranode->u.internal[n].down, &bh1))) { if ((unode = hpfs_map_anode(s, le32_to_cpu(ranode->u.internal[n].down), &bh1))) {
unode->up = ra; unode->up = cpu_to_le32(ra);
unode->btree.fnode_parent = 0; unode->btree.fnode_parent = 0;
mark_buffer_dirty(bh1); mark_buffer_dirty(bh1);
brelse(bh1); brelse(bh1);
...@@ -248,11 +248,11 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi ...@@ -248,11 +248,11 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi
btree->internal = 1; btree->internal = 1;
btree->n_free_nodes = fnod ? 10 : 58; btree->n_free_nodes = fnod ? 10 : 58;
btree->n_used_nodes = 2; btree->n_used_nodes = 2;
btree->first_free = (char *)&btree->u.internal[2] - (char *)btree; btree->first_free = cpu_to_le16((char *)&btree->u.internal[2] - (char *)btree);
btree->u.internal[0].file_secno = fs; btree->u.internal[0].file_secno = cpu_to_le32(fs);
btree->u.internal[0].down = ra; btree->u.internal[0].down = cpu_to_le32(ra);
btree->u.internal[1].file_secno = -1; btree->u.internal[1].file_secno = cpu_to_le32(-1);
btree->u.internal[1].down = na; btree->u.internal[1].down = cpu_to_le32(na);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
brelse(bh); brelse(bh);
mark_buffer_dirty(bh2); mark_buffer_dirty(bh2);
...@@ -279,7 +279,7 @@ void hpfs_remove_btree(struct super_block *s, struct bplus_header *btree) ...@@ -279,7 +279,7 @@ void hpfs_remove_btree(struct super_block *s, struct bplus_header *btree)
go_down: go_down:
d2 = 0; d2 = 0;
while (btree1->internal) { while (btree1->internal) {
ano = btree1->u.internal[pos].down; ano = le32_to_cpu(btree1->u.internal[pos].down);
if (level) brelse(bh); if (level) brelse(bh);
if (hpfs_sb(s)->sb_chk) if (hpfs_sb(s)->sb_chk)
if (hpfs_stop_cycles(s, ano, &d1, &d2, "hpfs_remove_btree #1")) if (hpfs_stop_cycles(s, ano, &d1, &d2, "hpfs_remove_btree #1"))
...@@ -290,7 +290,7 @@ void hpfs_remove_btree(struct super_block *s, struct bplus_header *btree) ...@@ -290,7 +290,7 @@ void hpfs_remove_btree(struct super_block *s, struct bplus_header *btree)
pos = 0; pos = 0;
} }
for (i = 0; i < btree1->n_used_nodes; i++) for (i = 0; i < btree1->n_used_nodes; i++)
hpfs_free_sectors(s, btree1->u.external[i].disk_secno, btree1->u.external[i].length); hpfs_free_sectors(s, le32_to_cpu(btree1->u.external[i].disk_secno), le32_to_cpu(btree1->u.external[i].length));
go_up: go_up:
if (!level) return; if (!level) return;
brelse(bh); brelse(bh);
...@@ -298,13 +298,13 @@ void hpfs_remove_btree(struct super_block *s, struct bplus_header *btree) ...@@ -298,13 +298,13 @@ void hpfs_remove_btree(struct super_block *s, struct bplus_header *btree)
if (hpfs_stop_cycles(s, ano, &c1, &c2, "hpfs_remove_btree #2")) return; if (hpfs_stop_cycles(s, ano, &c1, &c2, "hpfs_remove_btree #2")) return;
hpfs_free_sectors(s, ano, 1); hpfs_free_sectors(s, ano, 1);
oano = ano; oano = ano;
ano = anode->up; ano = le32_to_cpu(anode->up);
if (--level) { if (--level) {
if (!(anode = hpfs_map_anode(s, ano, &bh))) return; if (!(anode = hpfs_map_anode(s, ano, &bh))) return;
btree1 = &anode->btree; btree1 = &anode->btree;
} else btree1 = btree; } else btree1 = btree;
for (i = 0; i < btree1->n_used_nodes; i++) { for (i = 0; i < btree1->n_used_nodes; i++) {
if (btree1->u.internal[i].down == oano) { if (le32_to_cpu(btree1->u.internal[i].down) == oano) {
if ((pos = i + 1) < btree1->n_used_nodes) if ((pos = i + 1) < btree1->n_used_nodes)
goto go_down; goto go_down;
else else
...@@ -411,7 +411,7 @@ void hpfs_truncate_btree(struct super_block *s, secno f, int fno, unsigned secs) ...@@ -411,7 +411,7 @@ void hpfs_truncate_btree(struct super_block *s, secno f, int fno, unsigned secs)
if (fno) { if (fno) {
btree->n_free_nodes = 8; btree->n_free_nodes = 8;
btree->n_used_nodes = 0; btree->n_used_nodes = 0;
btree->first_free = 8; btree->first_free = cpu_to_le16(8);
btree->internal = 0; btree->internal = 0;
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
} else hpfs_free_sectors(s, f, 1); } else hpfs_free_sectors(s, f, 1);
...@@ -421,22 +421,22 @@ void hpfs_truncate_btree(struct super_block *s, secno f, int fno, unsigned secs) ...@@ -421,22 +421,22 @@ void hpfs_truncate_btree(struct super_block *s, secno f, int fno, unsigned secs)
while (btree->internal) { while (btree->internal) {
nodes = btree->n_used_nodes + btree->n_free_nodes; nodes = btree->n_used_nodes + btree->n_free_nodes;
for (i = 0; i < btree->n_used_nodes; i++) for (i = 0; i < btree->n_used_nodes; i++)
if (btree->u.internal[i].file_secno >= secs) goto f; if (le32_to_cpu(btree->u.internal[i].file_secno) >= secs) goto f;
brelse(bh); brelse(bh);
hpfs_error(s, "internal btree %08x doesn't end with -1", node); hpfs_error(s, "internal btree %08x doesn't end with -1", node);
return; return;
f: f:
for (j = i + 1; j < btree->n_used_nodes; j++) for (j = i + 1; j < btree->n_used_nodes; j++)
hpfs_ea_remove(s, btree->u.internal[j].down, 1, 0); hpfs_ea_remove(s, le32_to_cpu(btree->u.internal[j].down), 1, 0);
btree->n_used_nodes = i + 1; btree->n_used_nodes = i + 1;
btree->n_free_nodes = nodes - btree->n_used_nodes; btree->n_free_nodes = nodes - btree->n_used_nodes;
btree->first_free = 8 + 8 * btree->n_used_nodes; btree->first_free = cpu_to_le16(8 + 8 * btree->n_used_nodes);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
if (btree->u.internal[i].file_secno == secs) { if (btree->u.internal[i].file_secno == cpu_to_le32(secs)) {
brelse(bh); brelse(bh);
return; return;
} }
node = btree->u.internal[i].down; node = le32_to_cpu(btree->u.internal[i].down);
brelse(bh); brelse(bh);
if (hpfs_sb(s)->sb_chk) if (hpfs_sb(s)->sb_chk)
if (hpfs_stop_cycles(s, node, &c1, &c2, "hpfs_truncate_btree")) if (hpfs_stop_cycles(s, node, &c1, &c2, "hpfs_truncate_btree"))
...@@ -446,25 +446,25 @@ void hpfs_truncate_btree(struct super_block *s, secno f, int fno, unsigned secs) ...@@ -446,25 +446,25 @@ void hpfs_truncate_btree(struct super_block *s, secno f, int fno, unsigned secs)
} }
nodes = btree->n_used_nodes + btree->n_free_nodes; nodes = btree->n_used_nodes + btree->n_free_nodes;
for (i = 0; i < btree->n_used_nodes; i++) for (i = 0; i < btree->n_used_nodes; i++)
if (btree->u.external[i].file_secno + btree->u.external[i].length >= secs) goto ff; if (le32_to_cpu(btree->u.external[i].file_secno) + le32_to_cpu(btree->u.external[i].length) >= secs) goto ff;
brelse(bh); brelse(bh);
return; return;
ff: ff:
if (secs <= btree->u.external[i].file_secno) { if (secs <= le32_to_cpu(btree->u.external[i].file_secno)) {
hpfs_error(s, "there is an allocation error in file %08x, sector %08x", f, secs); hpfs_error(s, "there is an allocation error in file %08x, sector %08x", f, secs);
if (i) i--; if (i) i--;
} }
else if (btree->u.external[i].file_secno + btree->u.external[i].length > secs) { else if (le32_to_cpu(btree->u.external[i].file_secno) + le32_to_cpu(btree->u.external[i].length) > secs) {
hpfs_free_sectors(s, btree->u.external[i].disk_secno + secs - hpfs_free_sectors(s, le32_to_cpu(btree->u.external[i].disk_secno) + secs -
btree->u.external[i].file_secno, btree->u.external[i].length le32_to_cpu(btree->u.external[i].file_secno), le32_to_cpu(btree->u.external[i].length)
- secs + btree->u.external[i].file_secno); /* I hope gcc optimizes this :-) */ - secs + le32_to_cpu(btree->u.external[i].file_secno)); /* I hope gcc optimizes this :-) */
btree->u.external[i].length = secs - btree->u.external[i].file_secno; btree->u.external[i].length = cpu_to_le32(secs - le32_to_cpu(btree->u.external[i].file_secno));
} }
for (j = i + 1; j < btree->n_used_nodes; j++) for (j = i + 1; j < btree->n_used_nodes; j++)
hpfs_free_sectors(s, btree->u.external[j].disk_secno, btree->u.external[j].length); hpfs_free_sectors(s, le32_to_cpu(btree->u.external[j].disk_secno), le32_to_cpu(btree->u.external[j].length));
btree->n_used_nodes = i + 1; btree->n_used_nodes = i + 1;
btree->n_free_nodes = nodes - btree->n_used_nodes; btree->n_free_nodes = nodes - btree->n_used_nodes;
btree->first_free = 8 + 12 * btree->n_used_nodes; btree->first_free = cpu_to_le16(8 + 12 * btree->n_used_nodes);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
brelse(bh); brelse(bh);
} }
...@@ -480,12 +480,12 @@ void hpfs_remove_fnode(struct super_block *s, fnode_secno fno) ...@@ -480,12 +480,12 @@ void hpfs_remove_fnode(struct super_block *s, fnode_secno fno)
struct extended_attribute *ea_end; struct extended_attribute *ea_end;
if (!(fnode = hpfs_map_fnode(s, fno, &bh))) return; if (!(fnode = hpfs_map_fnode(s, fno, &bh))) return;
if (!fnode->dirflag) hpfs_remove_btree(s, &fnode->btree); if (!fnode->dirflag) hpfs_remove_btree(s, &fnode->btree);
else hpfs_remove_dtree(s, fnode->u.external[0].disk_secno); else hpfs_remove_dtree(s, le32_to_cpu(fnode->u.external[0].disk_secno));
ea_end = fnode_end_ea(fnode); ea_end = fnode_end_ea(fnode);
for (ea = fnode_ea(fnode); ea < ea_end; ea = next_ea(ea)) for (ea = fnode_ea(fnode); ea < ea_end; ea = next_ea(ea))
if (ea->indirect) if (ea->indirect)
hpfs_ea_remove(s, ea_sec(ea), ea->anode, ea_len(ea)); hpfs_ea_remove(s, ea_sec(ea), ea->anode, ea_len(ea));
hpfs_ea_ext_remove(s, fnode->ea_secno, fnode->ea_anode, fnode->ea_size_l); hpfs_ea_ext_remove(s, le32_to_cpu(fnode->ea_secno), fnode->ea_anode, le32_to_cpu(fnode->ea_size_l));
brelse(bh); brelse(bh);
hpfs_free_sectors(s, fno, 1); hpfs_free_sectors(s, fno, 1);
} }
...@@ -88,9 +88,9 @@ static int hpfs_readdir(struct file *filp, void *dirent, filldir_t filldir) ...@@ -88,9 +88,9 @@ static int hpfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
hpfs_error(inode->i_sb, "not a directory, fnode %08lx", hpfs_error(inode->i_sb, "not a directory, fnode %08lx",
(unsigned long)inode->i_ino); (unsigned long)inode->i_ino);
} }
if (hpfs_inode->i_dno != fno->u.external[0].disk_secno) { if (hpfs_inode->i_dno != le32_to_cpu(fno->u.external[0].disk_secno)) {
e = 1; e = 1;
hpfs_error(inode->i_sb, "corrupted inode: i_dno == %08x, fnode -> dnode == %08x", hpfs_inode->i_dno, fno->u.external[0].disk_secno); hpfs_error(inode->i_sb, "corrupted inode: i_dno == %08x, fnode -> dnode == %08x", hpfs_inode->i_dno, le32_to_cpu(fno->u.external[0].disk_secno));
} }
brelse(bh); brelse(bh);
if (e) { if (e) {
...@@ -156,7 +156,7 @@ static int hpfs_readdir(struct file *filp, void *dirent, filldir_t filldir) ...@@ -156,7 +156,7 @@ static int hpfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
goto again; goto again;
} }
tempname = hpfs_translate_name(inode->i_sb, de->name, de->namelen, lc, de->not_8x3); tempname = hpfs_translate_name(inode->i_sb, de->name, de->namelen, lc, de->not_8x3);
if (filldir(dirent, tempname, de->namelen, old_pos, de->fnode, DT_UNKNOWN) < 0) { if (filldir(dirent, tempname, de->namelen, old_pos, le32_to_cpu(de->fnode), DT_UNKNOWN) < 0) {
filp->f_pos = old_pos; filp->f_pos = old_pos;
if (tempname != de->name) kfree(tempname); if (tempname != de->name) kfree(tempname);
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
...@@ -221,7 +221,7 @@ struct dentry *hpfs_lookup(struct inode *dir, struct dentry *dentry, struct name ...@@ -221,7 +221,7 @@ struct dentry *hpfs_lookup(struct inode *dir, struct dentry *dentry, struct name
* Get inode number, what we're after. * Get inode number, what we're after.
*/ */
ino = de->fnode; ino = le32_to_cpu(de->fnode);
/* /*
* Go find or make an inode. * Go find or make an inode.
...@@ -236,7 +236,7 @@ struct dentry *hpfs_lookup(struct inode *dir, struct dentry *dentry, struct name ...@@ -236,7 +236,7 @@ struct dentry *hpfs_lookup(struct inode *dir, struct dentry *dentry, struct name
hpfs_init_inode(result); hpfs_init_inode(result);
if (de->directory) if (de->directory)
hpfs_read_inode(result); hpfs_read_inode(result);
else if (de->ea_size && hpfs_sb(dir->i_sb)->sb_eas) else if (le32_to_cpu(de->ea_size) && hpfs_sb(dir->i_sb)->sb_eas)
hpfs_read_inode(result); hpfs_read_inode(result);
else { else {
result->i_mode |= S_IFREG; result->i_mode |= S_IFREG;
...@@ -261,19 +261,19 @@ struct dentry *hpfs_lookup(struct inode *dir, struct dentry *dentry, struct name ...@@ -261,19 +261,19 @@ struct dentry *hpfs_lookup(struct inode *dir, struct dentry *dentry, struct name
*/ */
if (!result->i_ctime.tv_sec) { if (!result->i_ctime.tv_sec) {
if (!(result->i_ctime.tv_sec = local_to_gmt(dir->i_sb, de->creation_date))) if (!(result->i_ctime.tv_sec = local_to_gmt(dir->i_sb, le32_to_cpu(de->creation_date))))
result->i_ctime.tv_sec = 1; result->i_ctime.tv_sec = 1;
result->i_ctime.tv_nsec = 0; result->i_ctime.tv_nsec = 0;
result->i_mtime.tv_sec = local_to_gmt(dir->i_sb, de->write_date); result->i_mtime.tv_sec = local_to_gmt(dir->i_sb, le32_to_cpu(de->write_date));
result->i_mtime.tv_nsec = 0; result->i_mtime.tv_nsec = 0;
result->i_atime.tv_sec = local_to_gmt(dir->i_sb, de->read_date); result->i_atime.tv_sec = local_to_gmt(dir->i_sb, le32_to_cpu(de->read_date));
result->i_atime.tv_nsec = 0; result->i_atime.tv_nsec = 0;
hpfs_result->i_ea_size = de->ea_size; hpfs_result->i_ea_size = le32_to_cpu(de->ea_size);
if (!hpfs_result->i_ea_mode && de->read_only) if (!hpfs_result->i_ea_mode && de->read_only)
result->i_mode &= ~0222; result->i_mode &= ~0222;
if (!de->directory) { if (!de->directory) {
if (result->i_size == -1) { if (result->i_size == -1) {
result->i_size = de->file_size; result->i_size = le32_to_cpu(de->file_size);
result->i_data.a_ops = &hpfs_aops; result->i_data.a_ops = &hpfs_aops;
hpfs_i(result)->mmu_private = result->i_size; hpfs_i(result)->mmu_private = result->i_size;
/* /*
......
...@@ -14,11 +14,11 @@ static loff_t get_pos(struct dnode *d, struct hpfs_dirent *fde) ...@@ -14,11 +14,11 @@ static loff_t get_pos(struct dnode *d, struct hpfs_dirent *fde)
struct hpfs_dirent *de_end = dnode_end_de(d); struct hpfs_dirent *de_end = dnode_end_de(d);
int i = 1; int i = 1;
for (de = dnode_first_de(d); de < de_end; de = de_next_de(de)) { for (de = dnode_first_de(d); de < de_end; de = de_next_de(de)) {
if (de == fde) return ((loff_t) d->self << 4) | (loff_t)i; if (de == fde) return ((loff_t) le32_to_cpu(d->self) << 4) | (loff_t)i;
i++; i++;
} }
printk("HPFS: get_pos: not_found\n"); printk("HPFS: get_pos: not_found\n");
return ((loff_t)d->self << 4) | (loff_t)1; return ((loff_t)le32_to_cpu(d->self) << 4) | (loff_t)1;
} }
void hpfs_add_pos(struct inode *inode, loff_t *pos) void hpfs_add_pos(struct inode *inode, loff_t *pos)
...@@ -130,30 +130,30 @@ static void set_last_pointer(struct super_block *s, struct dnode *d, dnode_secno ...@@ -130,30 +130,30 @@ static void set_last_pointer(struct super_block *s, struct dnode *d, dnode_secno
{ {
struct hpfs_dirent *de; struct hpfs_dirent *de;
if (!(de = dnode_last_de(d))) { if (!(de = dnode_last_de(d))) {
hpfs_error(s, "set_last_pointer: empty dnode %08x", d->self); hpfs_error(s, "set_last_pointer: empty dnode %08x", le32_to_cpu(d->self));
return; return;
} }
if (hpfs_sb(s)->sb_chk) { if (hpfs_sb(s)->sb_chk) {
if (de->down) { if (de->down) {
hpfs_error(s, "set_last_pointer: dnode %08x has already last pointer %08x", hpfs_error(s, "set_last_pointer: dnode %08x has already last pointer %08x",
d->self, de_down_pointer(de)); le32_to_cpu(d->self), de_down_pointer(de));
return; return;
} }
if (de->length != 32) { if (le16_to_cpu(de->length) != 32) {
hpfs_error(s, "set_last_pointer: bad last dirent in dnode %08x", d->self); hpfs_error(s, "set_last_pointer: bad last dirent in dnode %08x", le32_to_cpu(d->self));
return; return;
} }
} }
if (ptr) { if (ptr) {
d->first_free = cpu_to_le32(le32_to_cpu(d->first_free) + 4); d->first_free = cpu_to_le32(le32_to_cpu(d->first_free) + 4);
if (le32_to_cpu(d->first_free) > 2048) { if (le32_to_cpu(d->first_free) > 2048) {
hpfs_error(s, "set_last_pointer: too long dnode %08x", d->self); hpfs_error(s, "set_last_pointer: too long dnode %08x", le32_to_cpu(d->self));
d->first_free = cpu_to_le32(le32_to_cpu(d->first_free) - 4); d->first_free = cpu_to_le32(le32_to_cpu(d->first_free) - 4);
return; return;
} }
de->length = 36; de->length = cpu_to_le16(36);
de->down = 1; de->down = 1;
*(dnode_secno *)((char *)de + 32) = ptr; *(dnode_secno *)((char *)de + 32) = cpu_to_le32(ptr);
} }
} }
...@@ -169,7 +169,7 @@ struct hpfs_dirent *hpfs_add_de(struct super_block *s, struct dnode *d, ...@@ -169,7 +169,7 @@ struct hpfs_dirent *hpfs_add_de(struct super_block *s, struct dnode *d,
for (de = dnode_first_de(d); de < de_end; de = de_next_de(de)) { for (de = dnode_first_de(d); de < de_end; de = de_next_de(de)) {
int c = hpfs_compare_names(s, name, namelen, de->name, de->namelen, de->last); int c = hpfs_compare_names(s, name, namelen, de->name, de->namelen, de->last);
if (!c) { if (!c) {
hpfs_error(s, "name (%c,%d) already exists in dnode %08x", *name, namelen, d->self); hpfs_error(s, "name (%c,%d) already exists in dnode %08x", *name, namelen, le32_to_cpu(d->self));
return NULL; return NULL;
} }
if (c < 0) break; if (c < 0) break;
...@@ -177,11 +177,10 @@ struct hpfs_dirent *hpfs_add_de(struct super_block *s, struct dnode *d, ...@@ -177,11 +177,10 @@ struct hpfs_dirent *hpfs_add_de(struct super_block *s, struct dnode *d,
memmove((char *)de + d_size, de, (char *)de_end - (char *)de); memmove((char *)de + d_size, de, (char *)de_end - (char *)de);
memset(de, 0, d_size); memset(de, 0, d_size);
if (down_ptr) { if (down_ptr) {
*(int *)((char *)de + d_size - 4) = down_ptr; *(dnode_secno *)((char *)de + d_size - 4) = cpu_to_le32(down_ptr);
de->down = 1; de->down = 1;
} }
de->length = d_size; de->length = cpu_to_le16(d_size);
if (down_ptr) de->down = 1;
de->not_8x3 = hpfs_is_name_long(name, namelen); de->not_8x3 = hpfs_is_name_long(name, namelen);
de->namelen = namelen; de->namelen = namelen;
memcpy(de->name, name, namelen); memcpy(de->name, name, namelen);
...@@ -195,10 +194,10 @@ static void hpfs_delete_de(struct super_block *s, struct dnode *d, ...@@ -195,10 +194,10 @@ static void hpfs_delete_de(struct super_block *s, struct dnode *d,
struct hpfs_dirent *de) struct hpfs_dirent *de)
{ {
if (de->last) { if (de->last) {
hpfs_error(s, "attempt to delete last dirent in dnode %08x", d->self); hpfs_error(s, "attempt to delete last dirent in dnode %08x", le32_to_cpu(d->self));
return; return;
} }
d->first_free = cpu_to_le32(le32_to_cpu(d->first_free) - de->length); d->first_free = cpu_to_le32(le32_to_cpu(d->first_free) - le16_to_cpu(de->length));
memmove(de, de_next_de(de), le32_to_cpu(d->first_free) + (char *)d - (char *)de); memmove(de, de_next_de(de), le32_to_cpu(d->first_free) + (char *)d - (char *)de);
} }
...@@ -206,14 +205,14 @@ static void fix_up_ptrs(struct super_block *s, struct dnode *d) ...@@ -206,14 +205,14 @@ static void fix_up_ptrs(struct super_block *s, struct dnode *d)
{ {
struct hpfs_dirent *de; struct hpfs_dirent *de;
struct hpfs_dirent *de_end = dnode_end_de(d); struct hpfs_dirent *de_end = dnode_end_de(d);
dnode_secno dno = d->self; dnode_secno dno = le32_to_cpu(d->self);
for (de = dnode_first_de(d); de < de_end; de = de_next_de(de)) for (de = dnode_first_de(d); de < de_end; de = de_next_de(de))
if (de->down) { if (de->down) {
struct quad_buffer_head qbh; struct quad_buffer_head qbh;
struct dnode *dd; struct dnode *dd;
if ((dd = hpfs_map_dnode(s, de_down_pointer(de), &qbh))) { if ((dd = hpfs_map_dnode(s, de_down_pointer(de), &qbh))) {
if (dd->up != dno || dd->root_dnode) { if (le32_to_cpu(dd->up) != dno || dd->root_dnode) {
dd->up = dno; dd->up = cpu_to_le32(dno);
dd->root_dnode = 0; dd->root_dnode = 0;
hpfs_mark_4buffers_dirty(&qbh); hpfs_mark_4buffers_dirty(&qbh);
} }
...@@ -291,7 +290,7 @@ static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno, ...@@ -291,7 +290,7 @@ static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno,
copy_de(de = hpfs_add_de(i->i_sb, nd, name, namelen, down_ptr), new_de); copy_de(de = hpfs_add_de(i->i_sb, nd, name, namelen, down_ptr), new_de);
for_all_poss(i, hpfs_pos_ins, get_pos(nd, de), 1); for_all_poss(i, hpfs_pos_ins, get_pos(nd, de), 1);
h = ((char *)dnode_last_de(nd) - (char *)nd) / 2 + 10; h = ((char *)dnode_last_de(nd) - (char *)nd) / 2 + 10;
if (!(ad = hpfs_alloc_dnode(i->i_sb, d->up, &adno, &qbh1))) { if (!(ad = hpfs_alloc_dnode(i->i_sb, le32_to_cpu(d->up), &adno, &qbh1))) {
hpfs_error(i->i_sb, "unable to alloc dnode - dnode tree will be corrupted"); hpfs_error(i->i_sb, "unable to alloc dnode - dnode tree will be corrupted");
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
kfree(nd); kfree(nd);
...@@ -315,19 +314,20 @@ static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno, ...@@ -315,19 +314,20 @@ static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno,
set_last_pointer(i->i_sb, ad, de->down ? de_down_pointer(de) : 0); set_last_pointer(i->i_sb, ad, de->down ? de_down_pointer(de) : 0);
de = de_next_de(de); de = de_next_de(de);
memmove((char *)nd + 20, de, le32_to_cpu(nd->first_free) + (char *)nd - (char *)de); memmove((char *)nd + 20, de, le32_to_cpu(nd->first_free) + (char *)nd - (char *)de);
nd->first_free = cpu_to_le32(le32_to_cpu(nd->first_free) - (char *)de - (char *)nd - 20); nd->first_free = cpu_to_le32(le32_to_cpu(nd->first_free) - ((char *)de - (char *)nd - 20));
memcpy(d, nd, le32_to_cpu(nd->first_free)); memcpy(d, nd, le32_to_cpu(nd->first_free));
for_all_poss(i, hpfs_pos_del, (loff_t)dno << 4, pos); for_all_poss(i, hpfs_pos_del, (loff_t)dno << 4, pos);
fix_up_ptrs(i->i_sb, ad); fix_up_ptrs(i->i_sb, ad);
if (!d->root_dnode) { if (!d->root_dnode) {
dno = ad->up = d->up; ad->up = d->up;
dno = le32_to_cpu(ad->up);
hpfs_mark_4buffers_dirty(&qbh); hpfs_mark_4buffers_dirty(&qbh);
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
hpfs_mark_4buffers_dirty(&qbh1); hpfs_mark_4buffers_dirty(&qbh1);
hpfs_brelse4(&qbh1); hpfs_brelse4(&qbh1);
goto go_up; goto go_up;
} }
if (!(rd = hpfs_alloc_dnode(i->i_sb, d->up, &rdno, &qbh2))) { if (!(rd = hpfs_alloc_dnode(i->i_sb, le32_to_cpu(d->up), &rdno, &qbh2))) {
hpfs_error(i->i_sb, "unable to alloc dnode - dnode tree will be corrupted"); hpfs_error(i->i_sb, "unable to alloc dnode - dnode tree will be corrupted");
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
hpfs_brelse4(&qbh1); hpfs_brelse4(&qbh1);
...@@ -339,7 +339,7 @@ static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno, ...@@ -339,7 +339,7 @@ static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno,
i->i_blocks += 4; i->i_blocks += 4;
rd->root_dnode = 1; rd->root_dnode = 1;
rd->up = d->up; rd->up = d->up;
if (!(fnode = hpfs_map_fnode(i->i_sb, d->up, &bh))) { if (!(fnode = hpfs_map_fnode(i->i_sb, le32_to_cpu(d->up), &bh))) {
hpfs_free_dnode(i->i_sb, rdno); hpfs_free_dnode(i->i_sb, rdno);
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
hpfs_brelse4(&qbh1); hpfs_brelse4(&qbh1);
...@@ -348,10 +348,11 @@ static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno, ...@@ -348,10 +348,11 @@ static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno,
kfree(nname); kfree(nname);
return 1; return 1;
} }
fnode->u.external[0].disk_secno = rdno; fnode->u.external[0].disk_secno = cpu_to_le32(rdno);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
brelse(bh); brelse(bh);
d->up = ad->up = hpfs_i(i)->i_dno = rdno; hpfs_i(i)->i_dno = rdno;
d->up = ad->up = cpu_to_le32(rdno);
d->root_dnode = ad->root_dnode = 0; d->root_dnode = ad->root_dnode = 0;
hpfs_mark_4buffers_dirty(&qbh); hpfs_mark_4buffers_dirty(&qbh);
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
...@@ -436,9 +437,9 @@ static secno move_to_top(struct inode *i, dnode_secno from, dnode_secno to) ...@@ -436,9 +437,9 @@ static secno move_to_top(struct inode *i, dnode_secno from, dnode_secno to)
return 0; return 0;
if (!(dnode = hpfs_map_dnode(i->i_sb, dno, &qbh))) return 0; if (!(dnode = hpfs_map_dnode(i->i_sb, dno, &qbh))) return 0;
if (hpfs_sb(i->i_sb)->sb_chk) { if (hpfs_sb(i->i_sb)->sb_chk) {
if (dnode->up != chk_up) { if (le32_to_cpu(dnode->up) != chk_up) {
hpfs_error(i->i_sb, "move_to_top: up pointer from %08x should be %08x, is %08x", hpfs_error(i->i_sb, "move_to_top: up pointer from %08x should be %08x, is %08x",
dno, chk_up, dnode->up); dno, chk_up, le32_to_cpu(dnode->up));
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
return 0; return 0;
} }
...@@ -454,7 +455,7 @@ static secno move_to_top(struct inode *i, dnode_secno from, dnode_secno to) ...@@ -454,7 +455,7 @@ static secno move_to_top(struct inode *i, dnode_secno from, dnode_secno to)
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
} }
while (!(de = dnode_pre_last_de(dnode))) { while (!(de = dnode_pre_last_de(dnode))) {
dnode_secno up = dnode->up; dnode_secno up = le32_to_cpu(dnode->up);
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
hpfs_free_dnode(i->i_sb, dno); hpfs_free_dnode(i->i_sb, dno);
i->i_size -= 2048; i->i_size -= 2048;
...@@ -474,7 +475,7 @@ static secno move_to_top(struct inode *i, dnode_secno from, dnode_secno to) ...@@ -474,7 +475,7 @@ static secno move_to_top(struct inode *i, dnode_secno from, dnode_secno to)
return 0; return 0;
} }
dnode->first_free = cpu_to_le32(le32_to_cpu(dnode->first_free) - 4); dnode->first_free = cpu_to_le32(le32_to_cpu(dnode->first_free) - 4);
de->length -= 4; de->length = cpu_to_le16(le16_to_cpu(de->length) - 4);
de->down = 0; de->down = 0;
hpfs_mark_4buffers_dirty(&qbh); hpfs_mark_4buffers_dirty(&qbh);
dno = up; dno = up;
...@@ -482,12 +483,12 @@ static secno move_to_top(struct inode *i, dnode_secno from, dnode_secno to) ...@@ -482,12 +483,12 @@ static secno move_to_top(struct inode *i, dnode_secno from, dnode_secno to)
t = get_pos(dnode, de); t = get_pos(dnode, de);
for_all_poss(i, hpfs_pos_subst, t, 4); for_all_poss(i, hpfs_pos_subst, t, 4);
for_all_poss(i, hpfs_pos_subst, t + 1, 5); for_all_poss(i, hpfs_pos_subst, t + 1, 5);
if (!(nde = kmalloc(de->length, GFP_NOFS))) { if (!(nde = kmalloc(le16_to_cpu(de->length), GFP_NOFS))) {
hpfs_error(i->i_sb, "out of memory for dirent - directory will be corrupted"); hpfs_error(i->i_sb, "out of memory for dirent - directory will be corrupted");
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
return 0; return 0;
} }
memcpy(nde, de, de->length); memcpy(nde, de, le16_to_cpu(de->length));
ddno = de->down ? de_down_pointer(de) : 0; ddno = de->down ? de_down_pointer(de) : 0;
hpfs_delete_de(i->i_sb, dnode, de); hpfs_delete_de(i->i_sb, dnode, de);
set_last_pointer(i->i_sb, dnode, ddno); set_last_pointer(i->i_sb, dnode, ddno);
...@@ -520,7 +521,7 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno) ...@@ -520,7 +521,7 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno)
if (le32_to_cpu(dnode->first_free) == 52 || le32_to_cpu(dnode->first_free) == 56) { if (le32_to_cpu(dnode->first_free) == 52 || le32_to_cpu(dnode->first_free) == 56) {
struct hpfs_dirent *de_end; struct hpfs_dirent *de_end;
int root = dnode->root_dnode; int root = dnode->root_dnode;
up = dnode->up; up = le32_to_cpu(dnode->up);
de = dnode_first_de(dnode); de = dnode_first_de(dnode);
down = de->down ? de_down_pointer(de) : 0; down = de->down ? de_down_pointer(de) : 0;
if (hpfs_sb(i->i_sb)->sb_chk) if (root && !down) { if (hpfs_sb(i->i_sb)->sb_chk) if (root && !down) {
...@@ -544,13 +545,13 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno) ...@@ -544,13 +545,13 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno)
return; return;
} }
if ((d1 = hpfs_map_dnode(i->i_sb, down, &qbh1))) { if ((d1 = hpfs_map_dnode(i->i_sb, down, &qbh1))) {
d1->up = up; d1->up = cpu_to_le32(up);
d1->root_dnode = 1; d1->root_dnode = 1;
hpfs_mark_4buffers_dirty(&qbh1); hpfs_mark_4buffers_dirty(&qbh1);
hpfs_brelse4(&qbh1); hpfs_brelse4(&qbh1);
} }
if ((fnode = hpfs_map_fnode(i->i_sb, up, &bh))) { if ((fnode = hpfs_map_fnode(i->i_sb, up, &bh))) {
fnode->u.external[0].disk_secno = down; fnode->u.external[0].disk_secno = cpu_to_le32(down);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
brelse(bh); brelse(bh);
} }
...@@ -569,16 +570,16 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno) ...@@ -569,16 +570,16 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno)
for_all_poss(i, hpfs_pos_subst, ((loff_t)dno << 4) | 1, ((loff_t)up << 4) | p); for_all_poss(i, hpfs_pos_subst, ((loff_t)dno << 4) | 1, ((loff_t)up << 4) | p);
if (!down) { if (!down) {
de->down = 0; de->down = 0;
de->length -= 4; de->length = cpu_to_le16(le16_to_cpu(de->length) - 4);
dnode->first_free = cpu_to_le32(le32_to_cpu(dnode->first_free) - 4); dnode->first_free = cpu_to_le32(le32_to_cpu(dnode->first_free) - 4);
memmove(de_next_de(de), (char *)de_next_de(de) + 4, memmove(de_next_de(de), (char *)de_next_de(de) + 4,
(char *)dnode + le32_to_cpu(dnode->first_free) - (char *)de_next_de(de)); (char *)dnode + le32_to_cpu(dnode->first_free) - (char *)de_next_de(de));
} else { } else {
struct dnode *d1; struct dnode *d1;
struct quad_buffer_head qbh1; struct quad_buffer_head qbh1;
*(dnode_secno *) ((void *) de + de->length - 4) = down; *(dnode_secno *) ((void *) de + le16_to_cpu(de->length) - 4) = down;
if ((d1 = hpfs_map_dnode(i->i_sb, down, &qbh1))) { if ((d1 = hpfs_map_dnode(i->i_sb, down, &qbh1))) {
d1->up = up; d1->up = cpu_to_le32(up);
hpfs_mark_4buffers_dirty(&qbh1); hpfs_mark_4buffers_dirty(&qbh1);
hpfs_brelse4(&qbh1); hpfs_brelse4(&qbh1);
} }
...@@ -595,18 +596,18 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno) ...@@ -595,18 +596,18 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno)
struct quad_buffer_head qbh1; struct quad_buffer_head qbh1;
if (!de_next->down) goto endm; if (!de_next->down) goto endm;
ndown = de_down_pointer(de_next); ndown = de_down_pointer(de_next);
if (!(de_cp = kmalloc(de->length, GFP_NOFS))) { if (!(de_cp = kmalloc(le16_to_cpu(de->length), GFP_NOFS))) {
printk("HPFS: out of memory for dtree balancing\n"); printk("HPFS: out of memory for dtree balancing\n");
goto endm; goto endm;
} }
memcpy(de_cp, de, de->length); memcpy(de_cp, de, le16_to_cpu(de->length));
hpfs_delete_de(i->i_sb, dnode, de); hpfs_delete_de(i->i_sb, dnode, de);
hpfs_mark_4buffers_dirty(&qbh); hpfs_mark_4buffers_dirty(&qbh);
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
for_all_poss(i, hpfs_pos_subst, ((loff_t)up << 4) | p, 4); for_all_poss(i, hpfs_pos_subst, ((loff_t)up << 4) | p, 4);
for_all_poss(i, hpfs_pos_del, ((loff_t)up << 4) | p, 1); for_all_poss(i, hpfs_pos_del, ((loff_t)up << 4) | p, 1);
if (de_cp->down) if ((d1 = hpfs_map_dnode(i->i_sb, de_down_pointer(de_cp), &qbh1))) { if (de_cp->down) if ((d1 = hpfs_map_dnode(i->i_sb, de_down_pointer(de_cp), &qbh1))) {
d1->up = ndown; d1->up = cpu_to_le32(ndown);
hpfs_mark_4buffers_dirty(&qbh1); hpfs_mark_4buffers_dirty(&qbh1);
hpfs_brelse4(&qbh1); hpfs_brelse4(&qbh1);
} }
...@@ -646,38 +647,38 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno) ...@@ -646,38 +647,38 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno)
printk("HPFS: warning: unbalanced dnode tree, see hpfs.txt 4 more info\n"); printk("HPFS: warning: unbalanced dnode tree, see hpfs.txt 4 more info\n");
printk("HPFS: warning: goin'on\n"); printk("HPFS: warning: goin'on\n");
} }
del->length += 4; del->length = cpu_to_le16(le16_to_cpu(del->length) + 4);
del->down = 1; del->down = 1;
d1->first_free = cpu_to_le32(le32_to_cpu(d1->first_free) + 4); d1->first_free = cpu_to_le32(le32_to_cpu(d1->first_free) + 4);
} }
if (dlp && !down) { if (dlp && !down) {
del->length -= 4; del->length = cpu_to_le16(le16_to_cpu(del->length) - 4);
del->down = 0; del->down = 0;
d1->first_free = cpu_to_le32(le32_to_cpu(d1->first_free) - 4); d1->first_free = cpu_to_le32(le32_to_cpu(d1->first_free) - 4);
} else if (down) } else if (down)
*(dnode_secno *) ((void *) del + del->length - 4) = down; *(dnode_secno *) ((void *) del + le16_to_cpu(del->length) - 4) = cpu_to_le32(down);
} else goto endm; } else goto endm;
if (!(de_cp = kmalloc(de_prev->length, GFP_NOFS))) { if (!(de_cp = kmalloc(le16_to_cpu(de_prev->length), GFP_NOFS))) {
printk("HPFS: out of memory for dtree balancing\n"); printk("HPFS: out of memory for dtree balancing\n");
hpfs_brelse4(&qbh1); hpfs_brelse4(&qbh1);
goto endm; goto endm;
} }
hpfs_mark_4buffers_dirty(&qbh1); hpfs_mark_4buffers_dirty(&qbh1);
hpfs_brelse4(&qbh1); hpfs_brelse4(&qbh1);
memcpy(de_cp, de_prev, de_prev->length); memcpy(de_cp, de_prev, le16_to_cpu(de_prev->length));
hpfs_delete_de(i->i_sb, dnode, de_prev); hpfs_delete_de(i->i_sb, dnode, de_prev);
if (!de_prev->down) { if (!de_prev->down) {
de_prev->length += 4; de_prev->length = cpu_to_le16(le16_to_cpu(de_prev->length) + 4);
de_prev->down = 1; de_prev->down = 1;
dnode->first_free = cpu_to_le32(le32_to_cpu(dnode->first_free) + 4); dnode->first_free = cpu_to_le32(le32_to_cpu(dnode->first_free) + 4);
} }
*(dnode_secno *) ((void *) de_prev + de_prev->length - 4) = ndown; *(dnode_secno *) ((void *) de_prev + le16_to_cpu(de_prev->length) - 4) = cpu_to_le32(ndown);
hpfs_mark_4buffers_dirty(&qbh); hpfs_mark_4buffers_dirty(&qbh);
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
for_all_poss(i, hpfs_pos_subst, ((loff_t)up << 4) | (p - 1), 4); for_all_poss(i, hpfs_pos_subst, ((loff_t)up << 4) | (p - 1), 4);
for_all_poss(i, hpfs_pos_subst, ((loff_t)up << 4) | p, ((loff_t)up << 4) | (p - 1)); for_all_poss(i, hpfs_pos_subst, ((loff_t)up << 4) | p, ((loff_t)up << 4) | (p - 1));
if (down) if ((d1 = hpfs_map_dnode(i->i_sb, de_down_pointer(de), &qbh1))) { if (down) if ((d1 = hpfs_map_dnode(i->i_sb, de_down_pointer(de), &qbh1))) {
d1->up = ndown; d1->up = cpu_to_le32(ndown);
hpfs_mark_4buffers_dirty(&qbh1); hpfs_mark_4buffers_dirty(&qbh1);
hpfs_brelse4(&qbh1); hpfs_brelse4(&qbh1);
} }
...@@ -744,8 +745,8 @@ void hpfs_count_dnodes(struct super_block *s, dnode_secno dno, int *n_dnodes, ...@@ -744,8 +745,8 @@ void hpfs_count_dnodes(struct super_block *s, dnode_secno dno, int *n_dnodes,
ptr = 0; ptr = 0;
go_up: go_up:
if (!(dnode = hpfs_map_dnode(s, dno, &qbh))) return; if (!(dnode = hpfs_map_dnode(s, dno, &qbh))) return;
if (hpfs_sb(s)->sb_chk) if (odno && odno != -1 && dnode->up != odno) if (hpfs_sb(s)->sb_chk) if (odno && odno != -1 && le32_to_cpu(dnode->up) != odno)
hpfs_error(s, "hpfs_count_dnodes: bad up pointer; dnode %08x, down %08x points to %08x", odno, dno, dnode->up); hpfs_error(s, "hpfs_count_dnodes: bad up pointer; dnode %08x, down %08x points to %08x", odno, dno, le32_to_cpu(dnode->up));
de = dnode_first_de(dnode); de = dnode_first_de(dnode);
if (ptr) while(1) { if (ptr) while(1) {
if (de->down) if (de_down_pointer(de) == ptr) goto process_de; if (de->down) if (de_down_pointer(de) == ptr) goto process_de;
...@@ -769,7 +770,7 @@ void hpfs_count_dnodes(struct super_block *s, dnode_secno dno, int *n_dnodes, ...@@ -769,7 +770,7 @@ void hpfs_count_dnodes(struct super_block *s, dnode_secno dno, int *n_dnodes,
if (!de->first && !de->last && n_items) (*n_items)++; if (!de->first && !de->last && n_items) (*n_items)++;
if ((de = de_next_de(de)) < dnode_end_de(dnode)) goto next_de; if ((de = de_next_de(de)) < dnode_end_de(dnode)) goto next_de;
ptr = dno; ptr = dno;
dno = dnode->up; dno = le32_to_cpu(dnode->up);
if (dnode->root_dnode) { if (dnode->root_dnode) {
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
return; return;
...@@ -817,8 +818,8 @@ dnode_secno hpfs_de_as_down_as_possible(struct super_block *s, dnode_secno dno) ...@@ -817,8 +818,8 @@ dnode_secno hpfs_de_as_down_as_possible(struct super_block *s, dnode_secno dno)
return d; return d;
if (!(de = map_nth_dirent(s, d, 1, &qbh, NULL))) return dno; if (!(de = map_nth_dirent(s, d, 1, &qbh, NULL))) return dno;
if (hpfs_sb(s)->sb_chk) if (hpfs_sb(s)->sb_chk)
if (up && ((struct dnode *)qbh.data)->up != up) if (up && le32_to_cpu(((struct dnode *)qbh.data)->up) != up)
hpfs_error(s, "hpfs_de_as_down_as_possible: bad up pointer; dnode %08x, down %08x points to %08x", up, d, ((struct dnode *)qbh.data)->up); hpfs_error(s, "hpfs_de_as_down_as_possible: bad up pointer; dnode %08x, down %08x points to %08x", up, d, le32_to_cpu(((struct dnode *)qbh.data)->up));
if (!de->down) { if (!de->down) {
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
return d; return d;
...@@ -867,7 +868,7 @@ struct hpfs_dirent *map_pos_dirent(struct inode *inode, loff_t *posp, ...@@ -867,7 +868,7 @@ struct hpfs_dirent *map_pos_dirent(struct inode *inode, loff_t *posp,
/* Going up */ /* Going up */
if (dnode->root_dnode) goto bail; if (dnode->root_dnode) goto bail;
if (!(up_dnode = hpfs_map_dnode(inode->i_sb, dnode->up, &qbh0))) if (!(up_dnode = hpfs_map_dnode(inode->i_sb, le32_to_cpu(dnode->up), &qbh0)))
goto bail; goto bail;
end_up_de = dnode_end_de(up_dnode); end_up_de = dnode_end_de(up_dnode);
...@@ -875,16 +876,16 @@ struct hpfs_dirent *map_pos_dirent(struct inode *inode, loff_t *posp, ...@@ -875,16 +876,16 @@ struct hpfs_dirent *map_pos_dirent(struct inode *inode, loff_t *posp,
for (up_de = dnode_first_de(up_dnode); up_de < end_up_de; for (up_de = dnode_first_de(up_dnode); up_de < end_up_de;
up_de = de_next_de(up_de)) { up_de = de_next_de(up_de)) {
if (!(++c & 077)) hpfs_error(inode->i_sb, if (!(++c & 077)) hpfs_error(inode->i_sb,
"map_pos_dirent: pos crossed dnode boundary; dnode = %08x", dnode->up); "map_pos_dirent: pos crossed dnode boundary; dnode = %08x", le32_to_cpu(dnode->up));
if (up_de->down && de_down_pointer(up_de) == dno) { if (up_de->down && de_down_pointer(up_de) == dno) {
*posp = ((loff_t) dnode->up << 4) + c; *posp = ((loff_t) le32_to_cpu(dnode->up) << 4) + c;
hpfs_brelse4(&qbh0); hpfs_brelse4(&qbh0);
return de; return de;
} }
} }
hpfs_error(inode->i_sb, "map_pos_dirent: pointer to dnode %08x not found in parent dnode %08x", hpfs_error(inode->i_sb, "map_pos_dirent: pointer to dnode %08x not found in parent dnode %08x",
dno, dnode->up); dno, le32_to_cpu(dnode->up));
hpfs_brelse4(&qbh0); hpfs_brelse4(&qbh0);
bail: bail:
...@@ -1010,17 +1011,17 @@ struct hpfs_dirent *map_fnode_dirent(struct super_block *s, fnode_secno fno, ...@@ -1010,17 +1011,17 @@ struct hpfs_dirent *map_fnode_dirent(struct super_block *s, fnode_secno fno,
/*name2[15] = 0xff;*/ /*name2[15] = 0xff;*/
name1len = 15; name2len = 256; name1len = 15; name2len = 256;
} }
if (!(upf = hpfs_map_fnode(s, f->up, &bh))) { if (!(upf = hpfs_map_fnode(s, le32_to_cpu(f->up), &bh))) {
kfree(name2); kfree(name2);
return NULL; return NULL;
} }
if (!upf->dirflag) { if (!upf->dirflag) {
brelse(bh); brelse(bh);
hpfs_error(s, "fnode %08x has non-directory parent %08x", fno, f->up); hpfs_error(s, "fnode %08x has non-directory parent %08x", fno, le32_to_cpu(f->up));
kfree(name2); kfree(name2);
return NULL; return NULL;
} }
dno = upf->u.external[0].disk_secno; dno = le32_to_cpu(upf->u.external[0].disk_secno);
brelse(bh); brelse(bh);
go_down: go_down:
downd = 0; downd = 0;
...@@ -1042,7 +1043,7 @@ struct hpfs_dirent *map_fnode_dirent(struct super_block *s, fnode_secno fno, ...@@ -1042,7 +1043,7 @@ struct hpfs_dirent *map_fnode_dirent(struct super_block *s, fnode_secno fno,
return NULL; return NULL;
} }
next_de: next_de:
if (de->fnode == fno) { if (le32_to_cpu(de->fnode) == fno) {
kfree(name2); kfree(name2);
return de; return de;
} }
...@@ -1058,7 +1059,7 @@ struct hpfs_dirent *map_fnode_dirent(struct super_block *s, fnode_secno fno, ...@@ -1058,7 +1059,7 @@ struct hpfs_dirent *map_fnode_dirent(struct super_block *s, fnode_secno fno,
goto go_down; goto go_down;
} }
f: f:
if (de->fnode == fno) { if (le32_to_cpu(de->fnode) == fno) {
kfree(name2); kfree(name2);
return de; return de;
} }
...@@ -1067,7 +1068,7 @@ struct hpfs_dirent *map_fnode_dirent(struct super_block *s, fnode_secno fno, ...@@ -1067,7 +1068,7 @@ struct hpfs_dirent *map_fnode_dirent(struct super_block *s, fnode_secno fno,
if ((de = de_next_de(de)) < de_end) goto next_de; if ((de = de_next_de(de)) < de_end) goto next_de;
if (d->root_dnode) goto not_found; if (d->root_dnode) goto not_found;
downd = dno; downd = dno;
dno = d->up; dno = le32_to_cpu(d->up);
hpfs_brelse4(qbh); hpfs_brelse4(qbh);
if (hpfs_sb(s)->sb_chk) if (hpfs_sb(s)->sb_chk)
if (hpfs_stop_cycles(s, downd, &d1, &d2, "map_fnode_dirent #2")) { if (hpfs_stop_cycles(s, downd, &d1, &d2, "map_fnode_dirent #2")) {
......
...@@ -24,7 +24,7 @@ void hpfs_ea_ext_remove(struct super_block *s, secno a, int ano, unsigned len) ...@@ -24,7 +24,7 @@ void hpfs_ea_ext_remove(struct super_block *s, secno a, int ano, unsigned len)
} }
if (hpfs_ea_read(s, a, ano, pos, 4, ex)) return; if (hpfs_ea_read(s, a, ano, pos, 4, ex)) return;
if (ea->indirect) { if (ea->indirect) {
if (ea->valuelen != 8) { if (le16_to_cpu(ea->valuelen) != 8) {
hpfs_error(s, "ea->indirect set while ea->valuelen!=8, %s %08x, pos %08x", hpfs_error(s, "ea->indirect set while ea->valuelen!=8, %s %08x, pos %08x",
ano ? "anode" : "sectors", a, pos); ano ? "anode" : "sectors", a, pos);
return; return;
...@@ -33,7 +33,7 @@ void hpfs_ea_ext_remove(struct super_block *s, secno a, int ano, unsigned len) ...@@ -33,7 +33,7 @@ void hpfs_ea_ext_remove(struct super_block *s, secno a, int ano, unsigned len)
return; return;
hpfs_ea_remove(s, ea_sec(ea), ea->anode, ea_len(ea)); hpfs_ea_remove(s, ea_sec(ea), ea->anode, ea_len(ea));
} }
pos += ea->namelen + ea->valuelen + 5; pos += ea->namelen + le16_to_cpu(ea->valuelen) + 5;
} }
if (!ano) hpfs_free_sectors(s, a, (len+511) >> 9); if (!ano) hpfs_free_sectors(s, a, (len+511) >> 9);
else { else {
...@@ -82,14 +82,14 @@ int hpfs_read_ea(struct super_block *s, struct fnode *fnode, char *key, ...@@ -82,14 +82,14 @@ int hpfs_read_ea(struct super_block *s, struct fnode *fnode, char *key,
if (!strcmp(ea->name, key)) { if (!strcmp(ea->name, key)) {
if (ea->indirect) if (ea->indirect)
goto indirect; goto indirect;
if (ea->valuelen >= size) if (le16_to_cpu(ea->valuelen) >= size)
return -EINVAL; return -EINVAL;
memcpy(buf, ea_data(ea), ea->valuelen); memcpy(buf, ea_data(ea), le16_to_cpu(ea->valuelen));
buf[ea->valuelen] = 0; buf[le16_to_cpu(ea->valuelen)] = 0;
return 0; return 0;
} }
a = fnode->ea_secno; a = le32_to_cpu(fnode->ea_secno);
len = fnode->ea_size_l; len = le32_to_cpu(fnode->ea_size_l);
ano = fnode->ea_anode; ano = fnode->ea_anode;
pos = 0; pos = 0;
while (pos < len) { while (pos < len) {
...@@ -106,14 +106,14 @@ int hpfs_read_ea(struct super_block *s, struct fnode *fnode, char *key, ...@@ -106,14 +106,14 @@ int hpfs_read_ea(struct super_block *s, struct fnode *fnode, char *key,
if (!strcmp(ea->name, key)) { if (!strcmp(ea->name, key)) {
if (ea->indirect) if (ea->indirect)
goto indirect; goto indirect;
if (ea->valuelen >= size) if (le16_to_cpu(ea->valuelen) >= size)
return -EINVAL; return -EINVAL;
if (hpfs_ea_read(s, a, ano, pos + 4 + ea->namelen + 1, ea->valuelen, buf)) if (hpfs_ea_read(s, a, ano, pos + 4 + ea->namelen + 1, le16_to_cpu(ea->valuelen), buf))
return -EIO; return -EIO;
buf[ea->valuelen] = 0; buf[le16_to_cpu(ea->valuelen)] = 0;
return 0; return 0;
} }
pos += ea->namelen + ea->valuelen + 5; pos += ea->namelen + le16_to_cpu(ea->valuelen) + 5;
} }
return -ENOENT; return -ENOENT;
indirect: indirect:
...@@ -138,16 +138,16 @@ char *hpfs_get_ea(struct super_block *s, struct fnode *fnode, char *key, int *si ...@@ -138,16 +138,16 @@ char *hpfs_get_ea(struct super_block *s, struct fnode *fnode, char *key, int *si
if (!strcmp(ea->name, key)) { if (!strcmp(ea->name, key)) {
if (ea->indirect) if (ea->indirect)
return get_indirect_ea(s, ea->anode, ea_sec(ea), *size = ea_len(ea)); return get_indirect_ea(s, ea->anode, ea_sec(ea), *size = ea_len(ea));
if (!(ret = kmalloc((*size = ea->valuelen) + 1, GFP_NOFS))) { if (!(ret = kmalloc((*size = le16_to_cpu(ea->valuelen)) + 1, GFP_NOFS))) {
printk("HPFS: out of memory for EA\n"); printk("HPFS: out of memory for EA\n");
return NULL; return NULL;
} }
memcpy(ret, ea_data(ea), ea->valuelen); memcpy(ret, ea_data(ea), le16_to_cpu(ea->valuelen));
ret[ea->valuelen] = 0; ret[le16_to_cpu(ea->valuelen)] = 0;
return ret; return ret;
} }
a = fnode->ea_secno; a = le32_to_cpu(fnode->ea_secno);
len = fnode->ea_size_l; len = le32_to_cpu(fnode->ea_size_l);
ano = fnode->ea_anode; ano = fnode->ea_anode;
pos = 0; pos = 0;
while (pos < len) { while (pos < len) {
...@@ -164,18 +164,18 @@ char *hpfs_get_ea(struct super_block *s, struct fnode *fnode, char *key, int *si ...@@ -164,18 +164,18 @@ char *hpfs_get_ea(struct super_block *s, struct fnode *fnode, char *key, int *si
if (!strcmp(ea->name, key)) { if (!strcmp(ea->name, key)) {
if (ea->indirect) if (ea->indirect)
return get_indirect_ea(s, ea->anode, ea_sec(ea), *size = ea_len(ea)); return get_indirect_ea(s, ea->anode, ea_sec(ea), *size = ea_len(ea));
if (!(ret = kmalloc((*size = ea->valuelen) + 1, GFP_NOFS))) { if (!(ret = kmalloc((*size = le16_to_cpu(ea->valuelen)) + 1, GFP_NOFS))) {
printk("HPFS: out of memory for EA\n"); printk("HPFS: out of memory for EA\n");
return NULL; return NULL;
} }
if (hpfs_ea_read(s, a, ano, pos + 4 + ea->namelen + 1, ea->valuelen, ret)) { if (hpfs_ea_read(s, a, ano, pos + 4 + ea->namelen + 1, le16_to_cpu(ea->valuelen), ret)) {
kfree(ret); kfree(ret);
return NULL; return NULL;
} }
ret[ea->valuelen] = 0; ret[le16_to_cpu(ea->valuelen)] = 0;
return ret; return ret;
} }
pos += ea->namelen + ea->valuelen + 5; pos += ea->namelen + le16_to_cpu(ea->valuelen) + 5;
} }
return NULL; return NULL;
} }
...@@ -202,13 +202,13 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key, ...@@ -202,13 +202,13 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key,
if (ea->indirect) { if (ea->indirect) {
if (ea_len(ea) == size) if (ea_len(ea) == size)
set_indirect_ea(s, ea->anode, ea_sec(ea), data, size); set_indirect_ea(s, ea->anode, ea_sec(ea), data, size);
} else if (ea->valuelen == size) { } else if (le16_to_cpu(ea->valuelen) == size) {
memcpy(ea_data(ea), data, size); memcpy(ea_data(ea), data, size);
} }
return; return;
} }
a = fnode->ea_secno; a = le32_to_cpu(fnode->ea_secno);
len = fnode->ea_size_l; len = le32_to_cpu(fnode->ea_size_l);
ano = fnode->ea_anode; ano = fnode->ea_anode;
pos = 0; pos = 0;
while (pos < len) { while (pos < len) {
...@@ -228,41 +228,41 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key, ...@@ -228,41 +228,41 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key,
set_indirect_ea(s, ea->anode, ea_sec(ea), data, size); set_indirect_ea(s, ea->anode, ea_sec(ea), data, size);
} }
else { else {
if (ea->valuelen == size) if (le16_to_cpu(ea->valuelen) == size)
hpfs_ea_write(s, a, ano, pos + 4 + ea->namelen + 1, size, data); hpfs_ea_write(s, a, ano, pos + 4 + ea->namelen + 1, size, data);
} }
return; return;
} }
pos += ea->namelen + ea->valuelen + 5; pos += ea->namelen + le16_to_cpu(ea->valuelen) + 5;
} }
if (!fnode->ea_offs) { if (!le16_to_cpu(fnode->ea_offs)) {
/*if (fnode->ea_size_s) { /*if (le16_to_cpu(fnode->ea_size_s)) {
hpfs_error(s, "fnode %08x: ea_size_s == %03x, ea_offs == 0", hpfs_error(s, "fnode %08x: ea_size_s == %03x, ea_offs == 0",
inode->i_ino, fnode->ea_size_s); inode->i_ino, le16_to_cpu(fnode->ea_size_s));
return; return;
}*/ }*/
fnode->ea_offs = 0xc4; fnode->ea_offs = cpu_to_le16(0xc4);
} }
if (fnode->ea_offs < 0xc4 || fnode->ea_offs + fnode->acl_size_s + fnode->ea_size_s > 0x200) { if (le16_to_cpu(fnode->ea_offs) < 0xc4 || le16_to_cpu(fnode->ea_offs) + le16_to_cpu(fnode->acl_size_s) + le16_to_cpu(fnode->ea_size_s) > 0x200) {
hpfs_error(s, "fnode %08lx: ea_offs == %03x, ea_size_s == %03x", hpfs_error(s, "fnode %08lx: ea_offs == %03x, ea_size_s == %03x",
(unsigned long)inode->i_ino, (unsigned long)inode->i_ino,
fnode->ea_offs, fnode->ea_size_s); le32_to_cpu(fnode->ea_offs), le16_to_cpu(fnode->ea_size_s));
return; return;
} }
if ((fnode->ea_size_s || !fnode->ea_size_l) && if ((le16_to_cpu(fnode->ea_size_s) || !le32_to_cpu(fnode->ea_size_l)) &&
fnode->ea_offs + fnode->acl_size_s + fnode->ea_size_s + strlen(key) + size + 5 <= 0x200) { le16_to_cpu(fnode->ea_offs) + le16_to_cpu(fnode->acl_size_s) + le16_to_cpu(fnode->ea_size_s) + strlen(key) + size + 5 <= 0x200) {
ea = fnode_end_ea(fnode); ea = fnode_end_ea(fnode);
*(char *)ea = 0; *(char *)ea = 0;
ea->namelen = strlen(key); ea->namelen = strlen(key);
ea->valuelen = size; ea->valuelen = cpu_to_le16(size);
strcpy(ea->name, key); strcpy(ea->name, key);
memcpy(ea_data(ea), data, size); memcpy(ea_data(ea), data, size);
fnode->ea_size_s += strlen(key) + size + 5; fnode->ea_size_s = cpu_to_le16(le16_to_cpu(fnode->ea_size_s) + strlen(key) + size + 5);
goto ret; goto ret;
} }
/* Most the code here is 99.9993422% unused. I hope there are no bugs. /* Most the code here is 99.9993422% unused. I hope there are no bugs.
But what .. HPFS.IFS has also bugs in ea management. */ But what .. HPFS.IFS has also bugs in ea management. */
if (fnode->ea_size_s && !fnode->ea_size_l) { if (le16_to_cpu(fnode->ea_size_s) && !le32_to_cpu(fnode->ea_size_l)) {
secno n; secno n;
struct buffer_head *bh; struct buffer_head *bh;
char *data; char *data;
...@@ -271,25 +271,26 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key, ...@@ -271,25 +271,26 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key,
hpfs_free_sectors(s, n, 1); hpfs_free_sectors(s, n, 1);
return; return;
} }
memcpy(data, fnode_ea(fnode), fnode->ea_size_s); memcpy(data, fnode_ea(fnode), le16_to_cpu(fnode->ea_size_s));
fnode->ea_size_l = fnode->ea_size_s; fnode->ea_size_l = cpu_to_le32(le16_to_cpu(fnode->ea_size_s));
fnode->ea_size_s = 0; fnode->ea_size_s = cpu_to_le16(0);
fnode->ea_secno = n; fnode->ea_secno = cpu_to_le32(n);
fnode->ea_anode = 0; fnode->ea_anode = cpu_to_le32(0);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
brelse(bh); brelse(bh);
} }
pos = fnode->ea_size_l + 5 + strlen(key) + size; pos = le32_to_cpu(fnode->ea_size_l) + 5 + strlen(key) + size;
len = (fnode->ea_size_l + 511) >> 9; len = (le32_to_cpu(fnode->ea_size_l) + 511) >> 9;
if (pos >= 30000) goto bail; if (pos >= 30000) goto bail;
while (((pos + 511) >> 9) > len) { while (((pos + 511) >> 9) > len) {
if (!len) { if (!len) {
if (!(fnode->ea_secno = hpfs_alloc_sector(s, fno, 1, 0))) secno q = hpfs_alloc_sector(s, fno, 1, 0);
goto bail; if (!q) goto bail;
fnode->ea_secno = cpu_to_le32(q);
fnode->ea_anode = 0; fnode->ea_anode = 0;
len++; len++;
} else if (!fnode->ea_anode) { } else if (!fnode->ea_anode) {
if (hpfs_alloc_if_possible(s, fnode->ea_secno + len)) { if (hpfs_alloc_if_possible(s, le32_to_cpu(fnode->ea_secno) + len)) {
len++; len++;
} else { } else {
/* Aargh... don't know how to create ea anodes :-( */ /* Aargh... don't know how to create ea anodes :-( */
...@@ -298,18 +299,18 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key, ...@@ -298,18 +299,18 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key,
anode_secno a_s; anode_secno a_s;
if (!(anode = hpfs_alloc_anode(s, fno, &a_s, &bh))) if (!(anode = hpfs_alloc_anode(s, fno, &a_s, &bh)))
goto bail; goto bail;
anode->up = fno; anode->up = cpu_to_le32(fno);
anode->btree.fnode_parent = 1; anode->btree.fnode_parent = 1;
anode->btree.n_free_nodes--; anode->btree.n_free_nodes--;
anode->btree.n_used_nodes++; anode->btree.n_used_nodes++;
anode->btree.first_free += 12; anode->btree.first_free = cpu_to_le16(le16_to_cpu(anode->btree.first_free) + 12);
anode->u.external[0].disk_secno = fnode->ea_secno; anode->u.external[0].disk_secno = cpu_to_le32(le32_to_cpu(fnode->ea_secno));
anode->u.external[0].file_secno = 0; anode->u.external[0].file_secno = cpu_to_le32(0);
anode->u.external[0].length = len; anode->u.external[0].length = cpu_to_le32(len);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
brelse(bh); brelse(bh);
fnode->ea_anode = 1; fnode->ea_anode = 1;
fnode->ea_secno = a_s;*/ fnode->ea_secno = cpu_to_le32(a_s);*/
secno new_sec; secno new_sec;
int i; int i;
if (!(new_sec = hpfs_alloc_sector(s, fno, 1, 1 - ((pos + 511) >> 9)))) if (!(new_sec = hpfs_alloc_sector(s, fno, 1, 1 - ((pos + 511) >> 9))))
...@@ -317,7 +318,7 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key, ...@@ -317,7 +318,7 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key,
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
struct buffer_head *bh1, *bh2; struct buffer_head *bh1, *bh2;
void *b1, *b2; void *b1, *b2;
if (!(b1 = hpfs_map_sector(s, fnode->ea_secno + i, &bh1, len - i - 1))) { if (!(b1 = hpfs_map_sector(s, le32_to_cpu(fnode->ea_secno) + i, &bh1, len - i - 1))) {
hpfs_free_sectors(s, new_sec, (pos + 511) >> 9); hpfs_free_sectors(s, new_sec, (pos + 511) >> 9);
goto bail; goto bail;
} }
...@@ -331,13 +332,13 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key, ...@@ -331,13 +332,13 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key,
mark_buffer_dirty(bh2); mark_buffer_dirty(bh2);
brelse(bh2); brelse(bh2);
} }
hpfs_free_sectors(s, fnode->ea_secno, len); hpfs_free_sectors(s, le32_to_cpu(fnode->ea_secno), len);
fnode->ea_secno = new_sec; fnode->ea_secno = cpu_to_le32(new_sec);
len = (pos + 511) >> 9; len = (pos + 511) >> 9;
} }
} }
if (fnode->ea_anode) { if (fnode->ea_anode) {
if (hpfs_add_sector_to_btree(s, fnode->ea_secno, if (hpfs_add_sector_to_btree(s, le32_to_cpu(fnode->ea_secno),
0, len) != -1) { 0, len) != -1) {
len++; len++;
} else { } else {
...@@ -349,17 +350,17 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key, ...@@ -349,17 +350,17 @@ void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key,
h[1] = strlen(key); h[1] = strlen(key);
h[2] = size & 0xff; h[2] = size & 0xff;
h[3] = size >> 8; h[3] = size >> 8;
if (hpfs_ea_write(s, fnode->ea_secno, fnode->ea_anode, fnode->ea_size_l, 4, h)) goto bail; if (hpfs_ea_write(s, le32_to_cpu(fnode->ea_secno), fnode->ea_anode, le32_to_cpu(fnode->ea_size_l), 4, h)) goto bail;
if (hpfs_ea_write(s, fnode->ea_secno, fnode->ea_anode, fnode->ea_size_l + 4, h[1] + 1, key)) goto bail; if (hpfs_ea_write(s, le32_to_cpu(fnode->ea_secno), fnode->ea_anode, le32_to_cpu(fnode->ea_size_l) + 4, h[1] + 1, key)) goto bail;
if (hpfs_ea_write(s, fnode->ea_secno, fnode->ea_anode, fnode->ea_size_l + 5 + h[1], size, data)) goto bail; if (hpfs_ea_write(s, le32_to_cpu(fnode->ea_secno), fnode->ea_anode, le32_to_cpu(fnode->ea_size_l) + 5 + h[1], size, data)) goto bail;
fnode->ea_size_l = pos; fnode->ea_size_l = cpu_to_le32(pos);
ret: ret:
hpfs_i(inode)->i_ea_size += 5 + strlen(key) + size; hpfs_i(inode)->i_ea_size += 5 + strlen(key) + size;
return; return;
bail: bail:
if (fnode->ea_secno) if (le32_to_cpu(fnode->ea_secno))
if (fnode->ea_anode) hpfs_truncate_btree(s, fnode->ea_secno, 1, (fnode->ea_size_l + 511) >> 9); if (fnode->ea_anode) hpfs_truncate_btree(s, le32_to_cpu(fnode->ea_secno), 1, (le32_to_cpu(fnode->ea_size_l) + 511) >> 9);
else hpfs_free_sectors(s, fnode->ea_secno + ((fnode->ea_size_l + 511) >> 9), len - ((fnode->ea_size_l + 511) >> 9)); else hpfs_free_sectors(s, le32_to_cpu(fnode->ea_secno) + ((le32_to_cpu(fnode->ea_size_l) + 511) >> 9), len - ((le32_to_cpu(fnode->ea_size_l) + 511) >> 9));
else fnode->ea_secno = fnode->ea_size_l = 0; else fnode->ea_secno = fnode->ea_size_l = cpu_to_le32(0);
} }
...@@ -19,6 +19,10 @@ ...@@ -19,6 +19,10 @@
For definitive information on HPFS, ask somebody else -- this is guesswork. For definitive information on HPFS, ask somebody else -- this is guesswork.
There are certain to be many mistakes. */ There are certain to be many mistakes. */
#if !defined(__LITTLE_ENDIAN) && !defined(__BIG_ENDIAN)
#error unknown endian
#endif
/* Notation */ /* Notation */
typedef u32 secno; /* sector number, partition relative */ typedef u32 secno; /* sector number, partition relative */
...@@ -86,7 +90,6 @@ struct hpfs_super_block ...@@ -86,7 +90,6 @@ struct hpfs_super_block
secno badblocks; /* bad block list */ secno badblocks; /* bad block list */
u32 zero3; /* 0 */ u32 zero3; /* 0 */
time32_t last_chkdsk; /* date last checked, 0 if never */ time32_t last_chkdsk; /* date last checked, 0 if never */
/*u32 zero4;*/ /* 0 */
time32_t last_optimize; /* date last optimized, 0 if never */ time32_t last_optimize; /* date last optimized, 0 if never */
secno n_dir_band; /* number of sectors in dir band */ secno n_dir_band; /* number of sectors in dir band */
secno dir_band_start; /* first sector in dir band */ secno dir_band_start; /* first sector in dir band */
...@@ -109,21 +112,44 @@ struct hpfs_spare_block ...@@ -109,21 +112,44 @@ struct hpfs_spare_block
u32 magic; /* f991 1849 */ u32 magic; /* f991 1849 */
u32 magic1; /* fa52 29c5, more magic? */ u32 magic1; /* fa52 29c5, more magic? */
unsigned dirty: 1; /* 0 clean, 1 "improperly stopped" */ #ifdef __LITTLE_ENDIAN
unsigned sparedir_used: 1; /* spare dirblks used */ u8 dirty: 1; /* 0 clean, 1 "improperly stopped" */
unsigned hotfixes_used: 1; /* hotfixes used */ u8 sparedir_used: 1; /* spare dirblks used */
unsigned bad_sector: 1; /* bad sector, corrupted disk (???) */ u8 hotfixes_used: 1; /* hotfixes used */
unsigned bad_bitmap: 1; /* bad bitmap */ u8 bad_sector: 1; /* bad sector, corrupted disk (???) */
unsigned fast: 1; /* partition was fast formatted */ u8 bad_bitmap: 1; /* bad bitmap */
unsigned old_wrote: 1; /* old version wrote to partion */ u8 fast: 1; /* partition was fast formatted */
unsigned old_wrote_1: 1; /* old version wrote to partion (?) */ u8 old_wrote: 1; /* old version wrote to partion */
unsigned install_dasd_limits: 1; /* HPFS386 flags */ u8 old_wrote_1: 1; /* old version wrote to partion (?) */
unsigned resynch_dasd_limits: 1; #else
unsigned dasd_limits_operational: 1; u8 old_wrote_1: 1; /* old version wrote to partion (?) */
unsigned multimedia_active: 1; u8 old_wrote: 1; /* old version wrote to partion */
unsigned dce_acls_active: 1; u8 fast: 1; /* partition was fast formatted */
unsigned dasd_limits_dirty: 1; u8 bad_bitmap: 1; /* bad bitmap */
unsigned flag67: 2; u8 bad_sector: 1; /* bad sector, corrupted disk (???) */
u8 hotfixes_used: 1; /* hotfixes used */
u8 sparedir_used: 1; /* spare dirblks used */
u8 dirty: 1; /* 0 clean, 1 "improperly stopped" */
#endif
#ifdef __LITTLE_ENDIAN
u8 install_dasd_limits: 1; /* HPFS386 flags */
u8 resynch_dasd_limits: 1;
u8 dasd_limits_operational: 1;
u8 multimedia_active: 1;
u8 dce_acls_active: 1;
u8 dasd_limits_dirty: 1;
u8 flag67: 2;
#else
u8 flag67: 2;
u8 dasd_limits_dirty: 1;
u8 dce_acls_active: 1;
u8 multimedia_active: 1;
u8 dasd_limits_operational: 1;
u8 resynch_dasd_limits: 1;
u8 install_dasd_limits: 1; /* HPFS386 flags */
#endif
u8 mm_contlgulty; u8 mm_contlgulty;
u8 unused; u8 unused;
...@@ -255,10 +281,18 @@ struct dnode { ...@@ -255,10 +281,18 @@ struct dnode {
u32 magic; /* 77e4 0aae */ u32 magic; /* 77e4 0aae */
u32 first_free; /* offset from start of dnode to u32 first_free; /* offset from start of dnode to
first free dir entry */ first free dir entry */
unsigned root_dnode:1; /* Is it root dnode? */ #ifdef __LITTLE_ENDIAN
unsigned increment_me:31; /* some kind of activity counter? u8 root_dnode: 1; /* Is it root dnode? */
Neither HPFS.IFS nor CHKDSK cares u8 increment_me: 7; /* some kind of activity counter? */
/* Neither HPFS.IFS nor CHKDSK cares
if you change this word */ if you change this word */
#else
u8 increment_me: 7; /* some kind of activity counter? */
/* Neither HPFS.IFS nor CHKDSK cares
if you change this word */
u8 root_dnode: 1; /* Is it root dnode? */
#endif
u8 increment_me2[3];
secno up; /* (root dnode) directory's fnode secno up; /* (root dnode) directory's fnode
(nonroot) parent dnode */ (nonroot) parent dnode */
dnode_secno self; /* pointer to this dnode */ dnode_secno self; /* pointer to this dnode */
...@@ -266,33 +300,59 @@ struct dnode { ...@@ -266,33 +300,59 @@ struct dnode {
}; };
struct hpfs_dirent { struct hpfs_dirent {
u16 length; /* offset to next dirent */ u16 length; /* offset to next dirent */
unsigned first: 1; /* set on phony ^A^A (".") entry */
unsigned has_acl: 1; #ifdef __LITTLE_ENDIAN
unsigned down: 1; /* down pointer present (after name) */ u8 first: 1; /* set on phony ^A^A (".") entry */
unsigned last: 1; /* set on phony \377 entry */ u8 has_acl: 1;
unsigned has_ea: 1; /* entry has EA */ u8 down: 1; /* down pointer present (after name) */
unsigned has_xtd_perm: 1; /* has extended perm list (???) */ u8 last: 1; /* set on phony \377 entry */
unsigned has_explicit_acl: 1; u8 has_ea: 1; /* entry has EA */
unsigned has_needea: 1; /* ?? some EA has NEEDEA set u8 has_xtd_perm: 1; /* has extended perm list (???) */
u8 has_explicit_acl: 1;
u8 has_needea: 1; /* ?? some EA has NEEDEA set
I have no idea why this is
interesting in a dir entry */
#else
u8 has_needea: 1; /* ?? some EA has NEEDEA set
I have no idea why this is I have no idea why this is
interesting in a dir entry */ interesting in a dir entry */
unsigned read_only: 1; /* dos attrib */ u8 has_explicit_acl: 1;
unsigned hidden: 1; /* dos attrib */ u8 has_xtd_perm: 1; /* has extended perm list (???) */
unsigned system: 1; /* dos attrib */ u8 has_ea: 1; /* entry has EA */
unsigned flag11: 1; /* would be volume label dos attrib */ u8 last: 1; /* set on phony \377 entry */
unsigned directory: 1; /* dos attrib */ u8 down: 1; /* down pointer present (after name) */
unsigned archive: 1; /* dos attrib */ u8 has_acl: 1;
unsigned not_8x3: 1; /* name is not 8.3 */ u8 first: 1; /* set on phony ^A^A (".") entry */
unsigned flag15: 1; #endif
#ifdef __LITTLE_ENDIAN
u8 read_only: 1; /* dos attrib */
u8 hidden: 1; /* dos attrib */
u8 system: 1; /* dos attrib */
u8 flag11: 1; /* would be volume label dos attrib */
u8 directory: 1; /* dos attrib */
u8 archive: 1; /* dos attrib */
u8 not_8x3: 1; /* name is not 8.3 */
u8 flag15: 1;
#else
u8 flag15: 1;
u8 not_8x3: 1; /* name is not 8.3 */
u8 archive: 1; /* dos attrib */
u8 directory: 1; /* dos attrib */
u8 flag11: 1; /* would be volume label dos attrib */
u8 system: 1; /* dos attrib */
u8 hidden: 1; /* dos attrib */
u8 read_only: 1; /* dos attrib */
#endif
fnode_secno fnode; /* fnode giving allocation info */ fnode_secno fnode; /* fnode giving allocation info */
time32_t write_date; /* mtime */ time32_t write_date; /* mtime */
u32 file_size; /* file length, bytes */ u32 file_size; /* file length, bytes */
time32_t read_date; /* atime */ time32_t read_date; /* atime */
time32_t creation_date; /* ctime */ time32_t creation_date; /* ctime */
u32 ea_size; /* total EA length, bytes */ u32 ea_size; /* total EA length, bytes */
unsigned char no_of_acls : 3; /* number of ACL's */ u8 no_of_acls; /* number of ACL's (low 3 bits) */
unsigned char reserver : 5;
u8 ix; /* code page index (of filename), see u8 ix; /* code page index (of filename), see
struct code_page_data */ struct code_page_data */
u8 namelen, name[1]; /* file name */ u8 namelen, name[1]; /* file name */
...@@ -328,21 +388,33 @@ struct bplus_internal_node ...@@ -328,21 +388,33 @@ struct bplus_internal_node
struct bplus_header struct bplus_header
{ {
unsigned hbff: 1; /* high bit of first free entry offset */ #ifdef __LITTLE_ENDIAN
unsigned flag1: 1; u8 hbff: 1; /* high bit of first free entry offset */
unsigned flag2: 1; u8 flag1234: 4;
unsigned flag3: 1; u8 fnode_parent: 1; /* ? we're pointed to by an fnode,
unsigned flag4: 1;
unsigned fnode_parent: 1; /* ? we're pointed to by an fnode,
the data btree or some ea or the the data btree or some ea or the
main ea bootage pointer ea_secno */ main ea bootage pointer ea_secno */
/* also can get set in fnodes, which /* also can get set in fnodes, which
may be a chkdsk glitch or may mean may be a chkdsk glitch or may mean
this bit is irrelevant in fnodes, this bit is irrelevant in fnodes,
or this interpretation is all wet */ or this interpretation is all wet */
unsigned binary_search: 1; /* suggest binary search (unused) */ u8 binary_search: 1; /* suggest binary search (unused) */
unsigned internal: 1; /* 1 -> (internal) tree of anodes u8 internal: 1; /* 1 -> (internal) tree of anodes
0 -> (leaf) list of extents */ 0 -> (leaf) list of extents */
#else
u8 internal: 1; /* 1 -> (internal) tree of anodes
0 -> (leaf) list of extents */
u8 binary_search: 1; /* suggest binary search (unused) */
u8 fnode_parent: 1; /* ? we're pointed to by an fnode,
the data btree or some ea or the
main ea bootage pointer ea_secno */
/* also can get set in fnodes, which
may be a chkdsk glitch or may mean
this bit is irrelevant in fnodes,
or this interpretation is all wet */
u8 flag1234: 4;
u8 hbff: 1; /* high bit of first free entry offset */
#endif
u8 fill[3]; u8 fill[3];
u8 n_free_nodes; /* free nodes in following array */ u8 n_free_nodes; /* free nodes in following array */
u8 n_used_nodes; /* used nodes in following array */ u8 n_used_nodes; /* used nodes in following array */
...@@ -379,23 +451,25 @@ struct fnode ...@@ -379,23 +451,25 @@ struct fnode
secno ea_secno; /* first sector of disk-resident ea's*/ secno ea_secno; /* first sector of disk-resident ea's*/
u16 ea_size_s; /* length of fnode-resident ea's */ u16 ea_size_s; /* length of fnode-resident ea's */
unsigned flag0: 1; #ifdef __LITTLE_ENDIAN
unsigned ea_anode: 1; /* 1 -> ea_secno is an anode */ u8 flag0: 1;
unsigned flag2: 1; u8 ea_anode: 1; /* 1 -> ea_secno is an anode */
unsigned flag3: 1; u8 flag234567: 6;
unsigned flag4: 1; #else
unsigned flag5: 1; u8 flag234567: 6;
unsigned flag6: 1; u8 ea_anode: 1; /* 1 -> ea_secno is an anode */
unsigned flag7: 1; u8 flag0: 1;
unsigned dirflag: 1; /* 1 -> directory. first & only extent #endif
#ifdef __LITTLE_ENDIAN
u8 dirflag: 1; /* 1 -> directory. first & only extent
points to dnode. */
u8 flag9012345: 7;
#else
u8 flag9012345: 7;
u8 dirflag: 1; /* 1 -> directory. first & only extent
points to dnode. */ points to dnode. */
unsigned flag9: 1; #endif
unsigned flag10: 1;
unsigned flag11: 1;
unsigned flag12: 1;
unsigned flag13: 1;
unsigned flag14: 1;
unsigned flag15: 1;
struct bplus_header btree; /* b+ tree, 8 extents or 12 subtrees */ struct bplus_header btree; /* b+ tree, 8 extents or 12 subtrees */
union { union {
...@@ -456,16 +530,21 @@ struct anode ...@@ -456,16 +530,21 @@ struct anode
struct extended_attribute struct extended_attribute
{ {
unsigned indirect: 1; /* 1 -> value gives sector number #ifdef __LITTLE_ENDIAN
u8 indirect: 1; /* 1 -> value gives sector number
where real value starts */ where real value starts */
unsigned anode: 1; /* 1 -> sector is an anode u8 anode: 1; /* 1 -> sector is an anode
that points to fragmented value */ that points to fragmented value */
unsigned flag2: 1; u8 flag23456: 5;
unsigned flag3: 1; u8 needea: 1; /* required ea */
unsigned flag4: 1; #else
unsigned flag5: 1; u8 needea: 1; /* required ea */
unsigned flag6: 1; u8 flag23456: 5;
unsigned needea: 1; /* required ea */ u8 anode: 1; /* 1 -> sector is an anode
that points to fragmented value */
u8 indirect: 1; /* 1 -> value gives sector number
where real value starts */
#endif
u8 namelen; /* length of name, bytes */ u8 namelen; /* length of name, bytes */
u16 valuelen; /* length of value, bytes */ u16 valuelen; /* length of value, bytes */
u8 name[0]; u8 name[0];
......
...@@ -84,7 +84,6 @@ struct hpfs_sb_info { ...@@ -84,7 +84,6 @@ struct hpfs_sb_info {
unsigned *sb_bmp_dir; /* main bitmap directory */ unsigned *sb_bmp_dir; /* main bitmap directory */
unsigned sb_c_bitmap; /* current bitmap */ unsigned sb_c_bitmap; /* current bitmap */
unsigned sb_max_fwd_alloc; /* max forwad allocation */ unsigned sb_max_fwd_alloc; /* max forwad allocation */
/*unsigned sb_mounting : 1;*/
int sb_timeshift; int sb_timeshift;
}; };
...@@ -100,7 +99,7 @@ struct quad_buffer_head { ...@@ -100,7 +99,7 @@ struct quad_buffer_head {
static inline dnode_secno de_down_pointer (struct hpfs_dirent *de) static inline dnode_secno de_down_pointer (struct hpfs_dirent *de)
{ {
CHKCOND(de->down,("HPFS: de_down_pointer: !de->down\n")); CHKCOND(de->down,("HPFS: de_down_pointer: !de->down\n"));
return *(dnode_secno *) ((void *) de + de->length - 4); return le32_to_cpu(*(dnode_secno *) ((void *) de + le16_to_cpu(de->length) - 4));
} }
/* The first dir entry in a dnode */ /* The first dir entry in a dnode */
...@@ -114,41 +113,41 @@ static inline struct hpfs_dirent *dnode_first_de (struct dnode *dnode) ...@@ -114,41 +113,41 @@ static inline struct hpfs_dirent *dnode_first_de (struct dnode *dnode)
static inline struct hpfs_dirent *dnode_end_de (struct dnode *dnode) static inline struct hpfs_dirent *dnode_end_de (struct dnode *dnode)
{ {
CHKCOND(dnode->first_free>=0x14 && dnode->first_free<=0xa00,("HPFS: dnode_end_de: dnode->first_free = %d\n",(int)dnode->first_free)); CHKCOND(le32_to_cpu(dnode->first_free)>=0x14 && le32_to_cpu(dnode->first_free)<=0xa00,("HPFS: dnode_end_de: dnode->first_free = %x\n",(unsigned)le32_to_cpu(dnode->first_free)));
return (void *) dnode + dnode->first_free; return (void *) dnode + le32_to_cpu(dnode->first_free);
} }
/* The dir entry after dir entry de */ /* The dir entry after dir entry de */
static inline struct hpfs_dirent *de_next_de (struct hpfs_dirent *de) static inline struct hpfs_dirent *de_next_de (struct hpfs_dirent *de)
{ {
CHKCOND(de->length>=0x20 && de->length<0x800,("HPFS: de_next_de: de->length = %d\n",(int)de->length)); CHKCOND(le16_to_cpu(de->length)>=0x20 && le16_to_cpu(de->length)<0x800,("HPFS: de_next_de: de->length = %x\n",(unsigned)le16_to_cpu(de->length)));
return (void *) de + de->length; return (void *) de + le16_to_cpu(de->length);
} }
static inline struct extended_attribute *fnode_ea(struct fnode *fnode) static inline struct extended_attribute *fnode_ea(struct fnode *fnode)
{ {
return (struct extended_attribute *)((char *)fnode + fnode->ea_offs + fnode->acl_size_s); return (struct extended_attribute *)((char *)fnode + le16_to_cpu(fnode->ea_offs) + le16_to_cpu(fnode->acl_size_s));
} }
static inline struct extended_attribute *fnode_end_ea(struct fnode *fnode) static inline struct extended_attribute *fnode_end_ea(struct fnode *fnode)
{ {
return (struct extended_attribute *)((char *)fnode + fnode->ea_offs + fnode->acl_size_s + fnode->ea_size_s); return (struct extended_attribute *)((char *)fnode + le16_to_cpu(fnode->ea_offs) + le16_to_cpu(fnode->acl_size_s) + le16_to_cpu(fnode->ea_size_s));
} }
static inline struct extended_attribute *next_ea(struct extended_attribute *ea) static inline struct extended_attribute *next_ea(struct extended_attribute *ea)
{ {
return (struct extended_attribute *)((char *)ea + 5 + ea->namelen + ea->valuelen); return (struct extended_attribute *)((char *)ea + 5 + ea->namelen + le16_to_cpu(ea->valuelen));
} }
static inline secno ea_sec(struct extended_attribute *ea) static inline secno ea_sec(struct extended_attribute *ea)
{ {
return *(secno *)((char *)ea + 9 + ea->namelen); return le32_to_cpu(*((secno *)((char *)ea + 9 + ea->namelen)));
} }
static inline secno ea_len(struct extended_attribute *ea) static inline secno ea_len(struct extended_attribute *ea)
{ {
return *(secno *)((char *)ea + 5 + ea->namelen); return le32_to_cpu(*((secno *)((char *)ea + 5 + ea->namelen)));
} }
static inline char *ea_data(struct extended_attribute *ea) static inline char *ea_data(struct extended_attribute *ea)
...@@ -173,13 +172,13 @@ static inline void copy_de(struct hpfs_dirent *dst, struct hpfs_dirent *src) ...@@ -173,13 +172,13 @@ static inline void copy_de(struct hpfs_dirent *dst, struct hpfs_dirent *src)
dst->not_8x3 = n; dst->not_8x3 = n;
} }
static inline unsigned tstbits(unsigned *bmp, unsigned b, unsigned n) static inline unsigned tstbits(u32 *bmp, unsigned b, unsigned n)
{ {
int i; int i;
if ((b >= 0x4000) || (b + n - 1 >= 0x4000)) return n; if ((b >= 0x4000) || (b + n - 1 >= 0x4000)) return n;
if (!((bmp[(b & 0x3fff) >> 5] >> (b & 0x1f)) & 1)) return 1; if (!((le32_to_cpu(bmp[(b & 0x3fff) >> 5]) >> (b & 0x1f)) & 1)) return 1;
for (i = 1; i < n; i++) for (i = 1; i < n; i++)
if (/*b+i < 0x4000 &&*/ !((bmp[((b+i) & 0x3fff) >> 5] >> ((b+i) & 0x1f)) & 1)) if (!((le32_to_cpu(bmp[((b+i) & 0x3fff) >> 5]) >> ((b+i) & 0x1f)) & 1))
return i + 1; return i + 1;
return 0; return 0;
} }
......
...@@ -115,8 +115,8 @@ void hpfs_read_inode(struct inode *i) ...@@ -115,8 +115,8 @@ void hpfs_read_inode(struct inode *i)
i->i_mode |= S_IFDIR; i->i_mode |= S_IFDIR;
i->i_op = &hpfs_dir_iops; i->i_op = &hpfs_dir_iops;
i->i_fop = &hpfs_dir_ops; i->i_fop = &hpfs_dir_ops;
hpfs_inode->i_parent_dir = fnode->up; hpfs_inode->i_parent_dir = le32_to_cpu(fnode->up);
hpfs_inode->i_dno = fnode->u.external[0].disk_secno; hpfs_inode->i_dno = le32_to_cpu(fnode->u.external[0].disk_secno);
if (hpfs_sb(sb)->sb_chk >= 2) { if (hpfs_sb(sb)->sb_chk >= 2) {
struct buffer_head *bh0; struct buffer_head *bh0;
if (hpfs_map_fnode(sb, hpfs_inode->i_parent_dir, &bh0)) brelse(bh0); if (hpfs_map_fnode(sb, hpfs_inode->i_parent_dir, &bh0)) brelse(bh0);
...@@ -132,7 +132,7 @@ void hpfs_read_inode(struct inode *i) ...@@ -132,7 +132,7 @@ void hpfs_read_inode(struct inode *i)
i->i_op = &hpfs_file_iops; i->i_op = &hpfs_file_iops;
i->i_fop = &hpfs_file_ops; i->i_fop = &hpfs_file_ops;
i->i_nlink = 1; i->i_nlink = 1;
i->i_size = fnode->file_size; i->i_size = le32_to_cpu(fnode->file_size);
i->i_blocks = ((i->i_size + 511) >> 9) + 1; i->i_blocks = ((i->i_size + 511) >> 9) + 1;
i->i_data.a_ops = &hpfs_aops; i->i_data.a_ops = &hpfs_aops;
hpfs_i(i)->mmu_private = i->i_size; hpfs_i(i)->mmu_private = i->i_size;
...@@ -143,7 +143,7 @@ void hpfs_read_inode(struct inode *i) ...@@ -143,7 +143,7 @@ void hpfs_read_inode(struct inode *i)
static void hpfs_write_inode_ea(struct inode *i, struct fnode *fnode) static void hpfs_write_inode_ea(struct inode *i, struct fnode *fnode)
{ {
struct hpfs_inode_info *hpfs_inode = hpfs_i(i); struct hpfs_inode_info *hpfs_inode = hpfs_i(i);
/*if (fnode->acl_size_l || fnode->acl_size_s) { /*if (le32_to_cpu(fnode->acl_size_l) || le16_to_cpu(fnode->acl_size_s)) {
Some unknown structures like ACL may be in fnode, Some unknown structures like ACL may be in fnode,
we'd better not overwrite them we'd better not overwrite them
hpfs_error(i->i_sb, "fnode %08x has some unknown HPFS386 stuctures", i->i_ino); hpfs_error(i->i_sb, "fnode %08x has some unknown HPFS386 stuctures", i->i_ino);
...@@ -218,30 +218,30 @@ void hpfs_write_inode_nolock(struct inode *i) ...@@ -218,30 +218,30 @@ void hpfs_write_inode_nolock(struct inode *i)
} }
} else de = NULL; } else de = NULL;
if (S_ISREG(i->i_mode)) { if (S_ISREG(i->i_mode)) {
fnode->file_size = i->i_size; fnode->file_size = cpu_to_le32(i->i_size);
if (de) de->file_size = i->i_size; if (de) de->file_size = cpu_to_le32(i->i_size);
} else if (S_ISDIR(i->i_mode)) { } else if (S_ISDIR(i->i_mode)) {
fnode->file_size = 0; fnode->file_size = cpu_to_le32(0);
if (de) de->file_size = 0; if (de) de->file_size = cpu_to_le32(0);
} }
hpfs_write_inode_ea(i, fnode); hpfs_write_inode_ea(i, fnode);
if (de) { if (de) {
de->write_date = gmt_to_local(i->i_sb, i->i_mtime.tv_sec); de->write_date = cpu_to_le32(gmt_to_local(i->i_sb, i->i_mtime.tv_sec));
de->read_date = gmt_to_local(i->i_sb, i->i_atime.tv_sec); de->read_date = cpu_to_le32(gmt_to_local(i->i_sb, i->i_atime.tv_sec));
de->creation_date = gmt_to_local(i->i_sb, i->i_ctime.tv_sec); de->creation_date = cpu_to_le32(gmt_to_local(i->i_sb, i->i_ctime.tv_sec));
de->read_only = !(i->i_mode & 0222); de->read_only = !(i->i_mode & 0222);
de->ea_size = hpfs_inode->i_ea_size; de->ea_size = cpu_to_le32(hpfs_inode->i_ea_size);
hpfs_mark_4buffers_dirty(&qbh); hpfs_mark_4buffers_dirty(&qbh);
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
} }
if (S_ISDIR(i->i_mode)) { if (S_ISDIR(i->i_mode)) {
if ((de = map_dirent(i, hpfs_inode->i_dno, "\001\001", 2, NULL, &qbh))) { if ((de = map_dirent(i, hpfs_inode->i_dno, "\001\001", 2, NULL, &qbh))) {
de->write_date = gmt_to_local(i->i_sb, i->i_mtime.tv_sec); de->write_date = cpu_to_le32(gmt_to_local(i->i_sb, i->i_mtime.tv_sec));
de->read_date = gmt_to_local(i->i_sb, i->i_atime.tv_sec); de->read_date = cpu_to_le32(gmt_to_local(i->i_sb, i->i_atime.tv_sec));
de->creation_date = gmt_to_local(i->i_sb, i->i_ctime.tv_sec); de->creation_date = cpu_to_le32(gmt_to_local(i->i_sb, i->i_ctime.tv_sec));
de->read_only = !(i->i_mode & 0222); de->read_only = !(i->i_mode & 0222);
de->ea_size = /*hpfs_inode->i_ea_size*/0; de->ea_size = cpu_to_le32(/*hpfs_inode->i_ea_size*/0);
de->file_size = 0; de->file_size = cpu_to_le32(0);
hpfs_mark_4buffers_dirty(&qbh); hpfs_mark_4buffers_dirty(&qbh);
hpfs_brelse4(&qbh); hpfs_brelse4(&qbh);
} else } else
......
...@@ -21,7 +21,7 @@ unsigned int *hpfs_map_bitmap(struct super_block *s, unsigned bmp_block, ...@@ -21,7 +21,7 @@ unsigned int *hpfs_map_bitmap(struct super_block *s, unsigned bmp_block,
hpfs_error(s, "hpfs_map_bitmap called with bad parameter: %08x at %s", bmp_block, id); hpfs_error(s, "hpfs_map_bitmap called with bad parameter: %08x at %s", bmp_block, id);
return NULL; return NULL;
} }
sec = hpfs_sb(s)->sb_bmp_dir[bmp_block]; sec = le32_to_cpu(hpfs_sb(s)->sb_bmp_dir[bmp_block]);
if (!sec || sec > hpfs_sb(s)->sb_fs_size-4) { if (!sec || sec > hpfs_sb(s)->sb_fs_size-4) {
hpfs_error(s, "invalid bitmap block pointer %08x -> %08x at %s", bmp_block, sec, id); hpfs_error(s, "invalid bitmap block pointer %08x -> %08x at %s", bmp_block, sec, id);
return NULL; return NULL;
...@@ -46,18 +46,18 @@ unsigned char *hpfs_load_code_page(struct super_block *s, secno cps) ...@@ -46,18 +46,18 @@ unsigned char *hpfs_load_code_page(struct super_block *s, secno cps)
struct code_page_data *cpd; struct code_page_data *cpd;
struct code_page_directory *cp = hpfs_map_sector(s, cps, &bh, 0); struct code_page_directory *cp = hpfs_map_sector(s, cps, &bh, 0);
if (!cp) return NULL; if (!cp) return NULL;
if (cp->magic != CP_DIR_MAGIC) { if (le32_to_cpu(cp->magic) != CP_DIR_MAGIC) {
printk("HPFS: Code page directory magic doesn't match (magic = %08x)\n", cp->magic); printk("HPFS: Code page directory magic doesn't match (magic = %08x)\n", le32_to_cpu(cp->magic));
brelse(bh); brelse(bh);
return NULL; return NULL;
} }
if (!cp->n_code_pages) { if (!le32_to_cpu(cp->n_code_pages)) {
printk("HPFS: n_code_pages == 0\n"); printk("HPFS: n_code_pages == 0\n");
brelse(bh); brelse(bh);
return NULL; return NULL;
} }
cpds = cp->array[0].code_page_data; cpds = le32_to_cpu(cp->array[0].code_page_data);
cpi = cp->array[0].index; cpi = le16_to_cpu(cp->array[0].index);
brelse(bh); brelse(bh);
if (cpi >= 3) { if (cpi >= 3) {
...@@ -66,12 +66,12 @@ unsigned char *hpfs_load_code_page(struct super_block *s, secno cps) ...@@ -66,12 +66,12 @@ unsigned char *hpfs_load_code_page(struct super_block *s, secno cps)
} }
if (!(cpd = hpfs_map_sector(s, cpds, &bh, 0))) return NULL; if (!(cpd = hpfs_map_sector(s, cpds, &bh, 0))) return NULL;
if ((unsigned)cpd->offs[cpi] > 0x178) { if (le16_to_cpu(cpd->offs[cpi]) > 0x178) {
printk("HPFS: Code page index out of sector\n"); printk("HPFS: Code page index out of sector\n");
brelse(bh); brelse(bh);
return NULL; return NULL;
} }
ptr = (unsigned char *)cpd + cpd->offs[cpi] + 6; ptr = (unsigned char *)cpd + le16_to_cpu(cpd->offs[cpi]) + 6;
if (!(cp_table = kmalloc(256, GFP_KERNEL))) { if (!(cp_table = kmalloc(256, GFP_KERNEL))) {
printk("HPFS: out of memory for code page table\n"); printk("HPFS: out of memory for code page table\n");
brelse(bh); brelse(bh);
...@@ -125,7 +125,7 @@ struct fnode *hpfs_map_fnode(struct super_block *s, ino_t ino, struct buffer_hea ...@@ -125,7 +125,7 @@ struct fnode *hpfs_map_fnode(struct super_block *s, ino_t ino, struct buffer_hea
if (hpfs_sb(s)->sb_chk) { if (hpfs_sb(s)->sb_chk) {
struct extended_attribute *ea; struct extended_attribute *ea;
struct extended_attribute *ea_end; struct extended_attribute *ea_end;
if (fnode->magic != FNODE_MAGIC) { if (le32_to_cpu(fnode->magic) != FNODE_MAGIC) {
hpfs_error(s, "bad magic on fnode %08lx", hpfs_error(s, "bad magic on fnode %08lx",
(unsigned long)ino); (unsigned long)ino);
goto bail; goto bail;
...@@ -138,7 +138,7 @@ struct fnode *hpfs_map_fnode(struct super_block *s, ino_t ino, struct buffer_hea ...@@ -138,7 +138,7 @@ struct fnode *hpfs_map_fnode(struct super_block *s, ino_t ino, struct buffer_hea
(unsigned long)ino); (unsigned long)ino);
goto bail; goto bail;
} }
if (fnode->btree.first_free != if (le16_to_cpu(fnode->btree.first_free) !=
8 + fnode->btree.n_used_nodes * (fnode->btree.internal ? 8 : 12)) { 8 + fnode->btree.n_used_nodes * (fnode->btree.internal ? 8 : 12)) {
hpfs_error(s, hpfs_error(s,
"bad first_free pointer in fnode %08lx", "bad first_free pointer in fnode %08lx",
...@@ -146,12 +146,12 @@ struct fnode *hpfs_map_fnode(struct super_block *s, ino_t ino, struct buffer_hea ...@@ -146,12 +146,12 @@ struct fnode *hpfs_map_fnode(struct super_block *s, ino_t ino, struct buffer_hea
goto bail; goto bail;
} }
} }
if (fnode->ea_size_s && ((signed int)fnode->ea_offs < 0xc4 || if (le16_to_cpu(fnode->ea_size_s) && (le16_to_cpu(fnode->ea_offs) < 0xc4 ||
(signed int)fnode->ea_offs + fnode->acl_size_s + fnode->ea_size_s > 0x200)) { le16_to_cpu(fnode->ea_offs) + le16_to_cpu(fnode->acl_size_s) + le16_to_cpu(fnode->ea_size_s) > 0x200)) {
hpfs_error(s, hpfs_error(s,
"bad EA info in fnode %08lx: ea_offs == %04x ea_size_s == %04x", "bad EA info in fnode %08lx: ea_offs == %04x ea_size_s == %04x",
(unsigned long)ino, (unsigned long)ino,
fnode->ea_offs, fnode->ea_size_s); le16_to_cpu(fnode->ea_offs), le16_to_cpu(fnode->ea_size_s));
goto bail; goto bail;
} }
ea = fnode_ea(fnode); ea = fnode_ea(fnode);
...@@ -178,16 +178,20 @@ struct anode *hpfs_map_anode(struct super_block *s, anode_secno ano, struct buff ...@@ -178,16 +178,20 @@ struct anode *hpfs_map_anode(struct super_block *s, anode_secno ano, struct buff
if (hpfs_sb(s)->sb_chk) if (hpfs_chk_sectors(s, ano, 1, "anode")) return NULL; if (hpfs_sb(s)->sb_chk) if (hpfs_chk_sectors(s, ano, 1, "anode")) return NULL;
if ((anode = hpfs_map_sector(s, ano, bhp, ANODE_RD_AHEAD))) if ((anode = hpfs_map_sector(s, ano, bhp, ANODE_RD_AHEAD)))
if (hpfs_sb(s)->sb_chk) { if (hpfs_sb(s)->sb_chk) {
if (anode->magic != ANODE_MAGIC || anode->self != ano) { if (le32_to_cpu(anode->magic) != ANODE_MAGIC) {
hpfs_error(s, "bad magic on anode %08x", ano); hpfs_error(s, "bad magic on anode %08x", ano);
goto bail; goto bail;
} }
if (le32_to_cpu(anode->self) != ano) {
hpfs_error(s, "self pointer invalid on anode %08x", ano);
goto bail;
}
if ((unsigned)anode->btree.n_used_nodes + (unsigned)anode->btree.n_free_nodes != if ((unsigned)anode->btree.n_used_nodes + (unsigned)anode->btree.n_free_nodes !=
(anode->btree.internal ? 60 : 40)) { (anode->btree.internal ? 60 : 40)) {
hpfs_error(s, "bad number of nodes in anode %08x", ano); hpfs_error(s, "bad number of nodes in anode %08x", ano);
goto bail; goto bail;
} }
if (anode->btree.first_free != if (le16_to_cpu(anode->btree.first_free) !=
8 + anode->btree.n_used_nodes * (anode->btree.internal ? 8 : 12)) { 8 + anode->btree.n_used_nodes * (anode->btree.internal ? 8 : 12)) {
hpfs_error(s, "bad first_free pointer in anode %08x", ano); hpfs_error(s, "bad first_free pointer in anode %08x", ano);
goto bail; goto bail;
...@@ -219,26 +223,26 @@ struct dnode *hpfs_map_dnode(struct super_block *s, unsigned secno, ...@@ -219,26 +223,26 @@ struct dnode *hpfs_map_dnode(struct super_block *s, unsigned secno,
unsigned p, pp = 0; unsigned p, pp = 0;
unsigned char *d = (unsigned char *)dnode; unsigned char *d = (unsigned char *)dnode;
int b = 0; int b = 0;
if (dnode->magic != DNODE_MAGIC) { if (le32_to_cpu(dnode->magic) != DNODE_MAGIC) {
hpfs_error(s, "bad magic on dnode %08x", secno); hpfs_error(s, "bad magic on dnode %08x", secno);
goto bail; goto bail;
} }
if (dnode->self != secno) if (le32_to_cpu(dnode->self) != secno)
hpfs_error(s, "bad self pointer on dnode %08x self = %08x", secno, dnode->self); hpfs_error(s, "bad self pointer on dnode %08x self = %08x", secno, le32_to_cpu(dnode->self));
/* Check dirents - bad dirents would cause infinite /* Check dirents - bad dirents would cause infinite
loops or shooting to memory */ loops or shooting to memory */
if (dnode->first_free > 2048/* || dnode->first_free < 84*/) { if (le32_to_cpu(dnode->first_free) > 2048) {
hpfs_error(s, "dnode %08x has first_free == %08x", secno, dnode->first_free); hpfs_error(s, "dnode %08x has first_free == %08x", secno, le32_to_cpu(dnode->first_free));
goto bail; goto bail;
} }
for (p = 20; p < dnode->first_free; p += d[p] + (d[p+1] << 8)) { for (p = 20; p < le32_to_cpu(dnode->first_free); p += d[p] + (d[p+1] << 8)) {
struct hpfs_dirent *de = (struct hpfs_dirent *)((char *)dnode + p); struct hpfs_dirent *de = (struct hpfs_dirent *)((char *)dnode + p);
if (de->length > 292 || (de->length < 32) || (de->length & 3) || p + de->length > 2048) { if (le16_to_cpu(de->length) > 292 || (le16_to_cpu(de->length) < 32) || (le16_to_cpu(de->length) & 3) || p + le16_to_cpu(de->length) > 2048) {
hpfs_error(s, "bad dirent size in dnode %08x, dirent %03x, last %03x", secno, p, pp); hpfs_error(s, "bad dirent size in dnode %08x, dirent %03x, last %03x", secno, p, pp);
goto bail; goto bail;
} }
if (((31 + de->namelen + de->down*4 + 3) & ~3) != de->length) { if (((31 + de->namelen + de->down*4 + 3) & ~3) != le16_to_cpu(de->length)) {
if (((31 + de->namelen + de->down*4 + 3) & ~3) < de->length && s->s_flags & MS_RDONLY) goto ok; if (((31 + de->namelen + de->down*4 + 3) & ~3) < le16_to_cpu(de->length) && s->s_flags & MS_RDONLY) goto ok;
hpfs_error(s, "namelen does not match dirent size in dnode %08x, dirent %03x, last %03x", secno, p, pp); hpfs_error(s, "namelen does not match dirent size in dnode %08x, dirent %03x, last %03x", secno, p, pp);
goto bail; goto bail;
} }
...@@ -251,7 +255,7 @@ struct dnode *hpfs_map_dnode(struct super_block *s, unsigned secno, ...@@ -251,7 +255,7 @@ struct dnode *hpfs_map_dnode(struct super_block *s, unsigned secno,
pp = p; pp = p;
} }
if (p != dnode->first_free) { if (p != le32_to_cpu(dnode->first_free)) {
hpfs_error(s, "size on last dirent does not match first_free; dnode %08x", secno); hpfs_error(s, "size on last dirent does not match first_free; dnode %08x", secno);
goto bail; goto bail;
} }
...@@ -277,7 +281,7 @@ dnode_secno hpfs_fnode_dno(struct super_block *s, ino_t ino) ...@@ -277,7 +281,7 @@ dnode_secno hpfs_fnode_dno(struct super_block *s, ino_t ino)
if (!fnode) if (!fnode)
return 0; return 0;
dno = fnode->u.external[0].disk_secno; dno = le32_to_cpu(fnode->u.external[0].disk_secno);
brelse(bh); brelse(bh);
return dno; return dno;
} }
...@@ -37,8 +37,8 @@ static int hpfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) ...@@ -37,8 +37,8 @@ static int hpfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
if (!(mode & 0222)) dee.read_only = 1; if (!(mode & 0222)) dee.read_only = 1;
/*dee.archive = 0;*/ /*dee.archive = 0;*/
dee.hidden = name[0] == '.'; dee.hidden = name[0] == '.';
dee.fnode = fno; dee.fnode = cpu_to_le32(fno);
dee.creation_date = dee.write_date = dee.read_date = gmt_to_local(dir->i_sb, get_seconds()); dee.creation_date = dee.write_date = dee.read_date = cpu_to_le32(gmt_to_local(dir->i_sb, get_seconds()));
result = new_inode(dir->i_sb); result = new_inode(dir->i_sb);
if (!result) if (!result)
goto bail2; goto bail2;
...@@ -46,7 +46,7 @@ static int hpfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) ...@@ -46,7 +46,7 @@ static int hpfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
result->i_ino = fno; result->i_ino = fno;
hpfs_i(result)->i_parent_dir = dir->i_ino; hpfs_i(result)->i_parent_dir = dir->i_ino;
hpfs_i(result)->i_dno = dno; hpfs_i(result)->i_dno = dno;
result->i_ctime.tv_sec = result->i_mtime.tv_sec = result->i_atime.tv_sec = local_to_gmt(dir->i_sb, dee.creation_date); result->i_ctime.tv_sec = result->i_mtime.tv_sec = result->i_atime.tv_sec = local_to_gmt(dir->i_sb, le32_to_cpu(dee.creation_date));
result->i_ctime.tv_nsec = 0; result->i_ctime.tv_nsec = 0;
result->i_mtime.tv_nsec = 0; result->i_mtime.tv_nsec = 0;
result->i_atime.tv_nsec = 0; result->i_atime.tv_nsec = 0;
...@@ -69,21 +69,21 @@ static int hpfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) ...@@ -69,21 +69,21 @@ static int hpfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
} }
fnode->len = len; fnode->len = len;
memcpy(fnode->name, name, len > 15 ? 15 : len); memcpy(fnode->name, name, len > 15 ? 15 : len);
fnode->up = dir->i_ino; fnode->up = cpu_to_le32(dir->i_ino);
fnode->dirflag = 1; fnode->dirflag = 1;
fnode->btree.n_free_nodes = 7; fnode->btree.n_free_nodes = 7;
fnode->btree.n_used_nodes = 1; fnode->btree.n_used_nodes = 1;
fnode->btree.first_free = 0x14; fnode->btree.first_free = cpu_to_le16(0x14);
fnode->u.external[0].disk_secno = dno; fnode->u.external[0].disk_secno = cpu_to_le32(dno);
fnode->u.external[0].file_secno = -1; fnode->u.external[0].file_secno = cpu_to_le32(-1);
dnode->root_dnode = 1; dnode->root_dnode = 1;
dnode->up = fno; dnode->up = cpu_to_le32(fno);
de = hpfs_add_de(dir->i_sb, dnode, "\001\001", 2, 0); de = hpfs_add_de(dir->i_sb, dnode, "\001\001", 2, 0);
de->creation_date = de->write_date = de->read_date = gmt_to_local(dir->i_sb, get_seconds()); de->creation_date = de->write_date = de->read_date = cpu_to_le32(gmt_to_local(dir->i_sb, get_seconds()));
if (!(mode & 0222)) de->read_only = 1; if (!(mode & 0222)) de->read_only = 1;
de->first = de->directory = 1; de->first = de->directory = 1;
/*de->hidden = de->system = 0;*/ /*de->hidden = de->system = 0;*/
de->fnode = fno; de->fnode = cpu_to_le32(fno);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
brelse(bh); brelse(bh);
hpfs_mark_4buffers_dirty(&qbh0); hpfs_mark_4buffers_dirty(&qbh0);
...@@ -137,8 +137,8 @@ static int hpfs_create(struct inode *dir, struct dentry *dentry, int mode, struc ...@@ -137,8 +137,8 @@ static int hpfs_create(struct inode *dir, struct dentry *dentry, int mode, struc
if (!(mode & 0222)) dee.read_only = 1; if (!(mode & 0222)) dee.read_only = 1;
dee.archive = 1; dee.archive = 1;
dee.hidden = name[0] == '.'; dee.hidden = name[0] == '.';
dee.fnode = fno; dee.fnode = cpu_to_le32(fno);
dee.creation_date = dee.write_date = dee.read_date = gmt_to_local(dir->i_sb, get_seconds()); dee.creation_date = dee.write_date = dee.read_date = cpu_to_le32(gmt_to_local(dir->i_sb, get_seconds()));
result = new_inode(dir->i_sb); result = new_inode(dir->i_sb);
if (!result) if (!result)
...@@ -152,7 +152,7 @@ static int hpfs_create(struct inode *dir, struct dentry *dentry, int mode, struc ...@@ -152,7 +152,7 @@ static int hpfs_create(struct inode *dir, struct dentry *dentry, int mode, struc
result->i_fop = &hpfs_file_ops; result->i_fop = &hpfs_file_ops;
result->i_nlink = 1; result->i_nlink = 1;
hpfs_i(result)->i_parent_dir = dir->i_ino; hpfs_i(result)->i_parent_dir = dir->i_ino;
result->i_ctime.tv_sec = result->i_mtime.tv_sec = result->i_atime.tv_sec = local_to_gmt(dir->i_sb, dee.creation_date); result->i_ctime.tv_sec = result->i_mtime.tv_sec = result->i_atime.tv_sec = local_to_gmt(dir->i_sb, le32_to_cpu(dee.creation_date));
result->i_ctime.tv_nsec = 0; result->i_ctime.tv_nsec = 0;
result->i_mtime.tv_nsec = 0; result->i_mtime.tv_nsec = 0;
result->i_atime.tv_nsec = 0; result->i_atime.tv_nsec = 0;
...@@ -173,7 +173,7 @@ static int hpfs_create(struct inode *dir, struct dentry *dentry, int mode, struc ...@@ -173,7 +173,7 @@ static int hpfs_create(struct inode *dir, struct dentry *dentry, int mode, struc
} }
fnode->len = len; fnode->len = len;
memcpy(fnode->name, name, len > 15 ? 15 : len); memcpy(fnode->name, name, len > 15 ? 15 : len);
fnode->up = dir->i_ino; fnode->up = cpu_to_le32(dir->i_ino);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
brelse(bh); brelse(bh);
...@@ -225,8 +225,8 @@ static int hpfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t ...@@ -225,8 +225,8 @@ static int hpfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t
if (!(mode & 0222)) dee.read_only = 1; if (!(mode & 0222)) dee.read_only = 1;
dee.archive = 1; dee.archive = 1;
dee.hidden = name[0] == '.'; dee.hidden = name[0] == '.';
dee.fnode = fno; dee.fnode = cpu_to_le32(fno);
dee.creation_date = dee.write_date = dee.read_date = gmt_to_local(dir->i_sb, get_seconds()); dee.creation_date = dee.write_date = dee.read_date = cpu_to_le32(gmt_to_local(dir->i_sb, get_seconds()));
result = new_inode(dir->i_sb); result = new_inode(dir->i_sb);
if (!result) if (!result)
...@@ -235,7 +235,7 @@ static int hpfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t ...@@ -235,7 +235,7 @@ static int hpfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t
hpfs_init_inode(result); hpfs_init_inode(result);
result->i_ino = fno; result->i_ino = fno;
hpfs_i(result)->i_parent_dir = dir->i_ino; hpfs_i(result)->i_parent_dir = dir->i_ino;
result->i_ctime.tv_sec = result->i_mtime.tv_sec = result->i_atime.tv_sec = local_to_gmt(dir->i_sb, dee.creation_date); result->i_ctime.tv_sec = result->i_mtime.tv_sec = result->i_atime.tv_sec = local_to_gmt(dir->i_sb, le32_to_cpu(dee.creation_date));
result->i_ctime.tv_nsec = 0; result->i_ctime.tv_nsec = 0;
result->i_mtime.tv_nsec = 0; result->i_mtime.tv_nsec = 0;
result->i_atime.tv_nsec = 0; result->i_atime.tv_nsec = 0;
...@@ -256,7 +256,7 @@ static int hpfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t ...@@ -256,7 +256,7 @@ static int hpfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t
} }
fnode->len = len; fnode->len = len;
memcpy(fnode->name, name, len > 15 ? 15 : len); memcpy(fnode->name, name, len > 15 ? 15 : len);
fnode->up = dir->i_ino; fnode->up = cpu_to_le32(dir->i_ino);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
insert_inode_hash(result); insert_inode_hash(result);
...@@ -300,8 +300,8 @@ static int hpfs_symlink(struct inode *dir, struct dentry *dentry, const char *sy ...@@ -300,8 +300,8 @@ static int hpfs_symlink(struct inode *dir, struct dentry *dentry, const char *sy
memset(&dee, 0, sizeof dee); memset(&dee, 0, sizeof dee);
dee.archive = 1; dee.archive = 1;
dee.hidden = name[0] == '.'; dee.hidden = name[0] == '.';
dee.fnode = fno; dee.fnode = cpu_to_le32(fno);
dee.creation_date = dee.write_date = dee.read_date = gmt_to_local(dir->i_sb, get_seconds()); dee.creation_date = dee.write_date = dee.read_date = cpu_to_le32(gmt_to_local(dir->i_sb, get_seconds()));
result = new_inode(dir->i_sb); result = new_inode(dir->i_sb);
if (!result) if (!result)
...@@ -309,7 +309,7 @@ static int hpfs_symlink(struct inode *dir, struct dentry *dentry, const char *sy ...@@ -309,7 +309,7 @@ static int hpfs_symlink(struct inode *dir, struct dentry *dentry, const char *sy
result->i_ino = fno; result->i_ino = fno;
hpfs_init_inode(result); hpfs_init_inode(result);
hpfs_i(result)->i_parent_dir = dir->i_ino; hpfs_i(result)->i_parent_dir = dir->i_ino;
result->i_ctime.tv_sec = result->i_mtime.tv_sec = result->i_atime.tv_sec = local_to_gmt(dir->i_sb, dee.creation_date); result->i_ctime.tv_sec = result->i_mtime.tv_sec = result->i_atime.tv_sec = local_to_gmt(dir->i_sb, le32_to_cpu(dee.creation_date));
result->i_ctime.tv_nsec = 0; result->i_ctime.tv_nsec = 0;
result->i_mtime.tv_nsec = 0; result->i_mtime.tv_nsec = 0;
result->i_atime.tv_nsec = 0; result->i_atime.tv_nsec = 0;
...@@ -332,7 +332,7 @@ static int hpfs_symlink(struct inode *dir, struct dentry *dentry, const char *sy ...@@ -332,7 +332,7 @@ static int hpfs_symlink(struct inode *dir, struct dentry *dentry, const char *sy
} }
fnode->len = len; fnode->len = len;
memcpy(fnode->name, name, len > 15 ? 15 : len); memcpy(fnode->name, name, len > 15 ? 15 : len);
fnode->up = dir->i_ino; fnode->up = cpu_to_le32(dir->i_ino);
hpfs_set_ea(result, fnode, "SYMLINK", symlink, strlen(symlink)); hpfs_set_ea(result, fnode, "SYMLINK", symlink, strlen(symlink));
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
brelse(bh); brelse(bh);
...@@ -382,7 +382,7 @@ static int hpfs_unlink(struct inode *dir, struct dentry *dentry) ...@@ -382,7 +382,7 @@ static int hpfs_unlink(struct inode *dir, struct dentry *dentry)
if (de->directory) if (de->directory)
goto out1; goto out1;
fno = de->fnode; fno = le32_to_cpu(de->fnode);
r = hpfs_remove_dirent(dir, dno, de, &qbh, 1); r = hpfs_remove_dirent(dir, dno, de, &qbh, 1);
switch (r) { switch (r) {
case 1: case 1:
...@@ -465,7 +465,7 @@ static int hpfs_rmdir(struct inode *dir, struct dentry *dentry) ...@@ -465,7 +465,7 @@ static int hpfs_rmdir(struct inode *dir, struct dentry *dentry)
if (n_items) if (n_items)
goto out1; goto out1;
fno = de->fnode; fno = le32_to_cpu(de->fnode);
r = hpfs_remove_dirent(dir, dno, de, &qbh, 1); r = hpfs_remove_dirent(dir, dno, de, &qbh, 1);
switch (r) { switch (r) {
case 1: case 1:
...@@ -608,7 +608,7 @@ static int hpfs_rename(struct inode *old_dir, struct dentry *old_dentry, ...@@ -608,7 +608,7 @@ static int hpfs_rename(struct inode *old_dir, struct dentry *old_dentry,
drop_nlink(old_dir); drop_nlink(old_dir);
} }
if ((fnode = hpfs_map_fnode(i->i_sb, i->i_ino, &bh))) { if ((fnode = hpfs_map_fnode(i->i_sb, i->i_ino, &bh))) {
fnode->up = new_dir->i_ino; fnode->up = cpu_to_le32(new_dir->i_ino);
fnode->len = new_len; fnode->len = new_len;
memcpy(fnode->name, new_name, new_len>15?15:new_len); memcpy(fnode->name, new_name, new_len>15?15:new_len);
if (new_len < 15) memset(&fnode->name[new_len], 0, 15 - new_len); if (new_len < 15) memset(&fnode->name[new_len], 0, 15 - new_len);
......
...@@ -135,7 +135,7 @@ static unsigned count_bitmaps(struct super_block *s) ...@@ -135,7 +135,7 @@ static unsigned count_bitmaps(struct super_block *s)
n_bands = (hpfs_sb(s)->sb_fs_size + 0x3fff) >> 14; n_bands = (hpfs_sb(s)->sb_fs_size + 0x3fff) >> 14;
count = 0; count = 0;
for (n = 0; n < n_bands; n++) for (n = 0; n < n_bands; n++)
count += hpfs_count_one_bitmap(s, hpfs_sb(s)->sb_bmp_dir[n]); count += hpfs_count_one_bitmap(s, le32_to_cpu(hpfs_sb(s)->sb_bmp_dir[n]));
return count; return count;
} }
...@@ -509,9 +509,9 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent) ...@@ -509,9 +509,9 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)
if (!(spareblock = hpfs_map_sector(s, 17, &bh2, 0))) goto bail3; if (!(spareblock = hpfs_map_sector(s, 17, &bh2, 0))) goto bail3;
/* Check magics */ /* Check magics */
if (/*bootblock->magic != BB_MAGIC if (/*le16_to_cpu(bootblock->magic) != BB_MAGIC
||*/ superblock->magic != SB_MAGIC ||*/ le32_to_cpu(superblock->magic) != SB_MAGIC
|| spareblock->magic != SP_MAGIC) { || le32_to_cpu(spareblock->magic) != SP_MAGIC) {
if (!silent) printk("HPFS: Bad magic ... probably not HPFS\n"); if (!silent) printk("HPFS: Bad magic ... probably not HPFS\n");
goto bail4; goto bail4;
} }
...@@ -532,12 +532,12 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent) ...@@ -532,12 +532,12 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)
s->s_op = &hpfs_sops; s->s_op = &hpfs_sops;
s->s_d_op = &hpfs_dentry_operations; s->s_d_op = &hpfs_dentry_operations;
sbi->sb_root = superblock->root; sbi->sb_root = le32_to_cpu(superblock->root);
sbi->sb_fs_size = superblock->n_sectors; sbi->sb_fs_size = le32_to_cpu(superblock->n_sectors);
sbi->sb_bitmaps = superblock->bitmaps; sbi->sb_bitmaps = le32_to_cpu(superblock->bitmaps);
sbi->sb_dirband_start = superblock->dir_band_start; sbi->sb_dirband_start = le32_to_cpu(superblock->dir_band_start);
sbi->sb_dirband_size = superblock->n_dir_band; sbi->sb_dirband_size = le32_to_cpu(superblock->n_dir_band);
sbi->sb_dmap = superblock->dir_band_bitmap; sbi->sb_dmap = le32_to_cpu(superblock->dir_band_bitmap);
sbi->sb_uid = uid; sbi->sb_uid = uid;
sbi->sb_gid = gid; sbi->sb_gid = gid;
sbi->sb_mode = 0777 & ~umask; sbi->sb_mode = 0777 & ~umask;
...@@ -555,7 +555,7 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent) ...@@ -555,7 +555,7 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)
sbi->sb_max_fwd_alloc = 0xffffff; sbi->sb_max_fwd_alloc = 0xffffff;
/* Load bitmap directory */ /* Load bitmap directory */
if (!(sbi->sb_bmp_dir = hpfs_load_bitmap_directory(s, superblock->bitmaps))) if (!(sbi->sb_bmp_dir = hpfs_load_bitmap_directory(s, le32_to_cpu(superblock->bitmaps))))
goto bail4; goto bail4;
/* Check for general fs errors*/ /* Check for general fs errors*/
...@@ -573,7 +573,7 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent) ...@@ -573,7 +573,7 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)
mark_buffer_dirty(bh2); mark_buffer_dirty(bh2);
} }
if (spareblock->hotfixes_used || spareblock->n_spares_used) { if (le32_to_cpu(spareblock->hotfixes_used) || le32_to_cpu(spareblock->n_spares_used)) {
if (errs >= 2) { if (errs >= 2) {
printk("HPFS: Hotfixes not supported here, try chkdsk\n"); printk("HPFS: Hotfixes not supported here, try chkdsk\n");
mark_dirty(s, 0); mark_dirty(s, 0);
...@@ -583,7 +583,7 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent) ...@@ -583,7 +583,7 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)
if (errs == 0) printk("HPFS: Proceeding, but your filesystem will be probably corrupted by this driver...\n"); if (errs == 0) printk("HPFS: Proceeding, but your filesystem will be probably corrupted by this driver...\n");
else printk("HPFS: This driver may read bad files or crash when operating on disk with hotfixes.\n"); else printk("HPFS: This driver may read bad files or crash when operating on disk with hotfixes.\n");
} }
if (spareblock->n_dnode_spares != spareblock->n_dnode_spares_free) { if (le32_to_cpu(spareblock->n_dnode_spares) != le32_to_cpu(spareblock->n_dnode_spares_free)) {
if (errs >= 2) { if (errs >= 2) {
printk("HPFS: Spare dnodes used, try chkdsk\n"); printk("HPFS: Spare dnodes used, try chkdsk\n");
mark_dirty(s, 0); mark_dirty(s, 0);
...@@ -594,17 +594,17 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent) ...@@ -594,17 +594,17 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)
} }
if (chk) { if (chk) {
unsigned a; unsigned a;
if (superblock->dir_band_end - superblock->dir_band_start + 1 != superblock->n_dir_band || if (le32_to_cpu(superblock->dir_band_end) - le32_to_cpu(superblock->dir_band_start) + 1 != le32_to_cpu(superblock->n_dir_band) ||
superblock->dir_band_end < superblock->dir_band_start || superblock->n_dir_band > 0x4000) { le32_to_cpu(superblock->dir_band_end) < le32_to_cpu(superblock->dir_band_start) || le32_to_cpu(superblock->n_dir_band) > 0x4000) {
hpfs_error(s, "dir band size mismatch: dir_band_start==%08x, dir_band_end==%08x, n_dir_band==%08x", hpfs_error(s, "dir band size mismatch: dir_band_start==%08x, dir_band_end==%08x, n_dir_band==%08x",
superblock->dir_band_start, superblock->dir_band_end, superblock->n_dir_band); le32_to_cpu(superblock->dir_band_start), le32_to_cpu(superblock->dir_band_end), le32_to_cpu(superblock->n_dir_band));
goto bail4; goto bail4;
} }
a = sbi->sb_dirband_size; a = sbi->sb_dirband_size;
sbi->sb_dirband_size = 0; sbi->sb_dirband_size = 0;
if (hpfs_chk_sectors(s, superblock->dir_band_start, superblock->n_dir_band, "dir_band") || if (hpfs_chk_sectors(s, le32_to_cpu(superblock->dir_band_start), le32_to_cpu(superblock->n_dir_band), "dir_band") ||
hpfs_chk_sectors(s, superblock->dir_band_bitmap, 4, "dir_band_bitmap") || hpfs_chk_sectors(s, le32_to_cpu(superblock->dir_band_bitmap), 4, "dir_band_bitmap") ||
hpfs_chk_sectors(s, superblock->bitmaps, 4, "bitmaps")) { hpfs_chk_sectors(s, le32_to_cpu(superblock->bitmaps), 4, "bitmaps")) {
mark_dirty(s, 0); mark_dirty(s, 0);
goto bail4; goto bail4;
} }
...@@ -612,8 +612,8 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent) ...@@ -612,8 +612,8 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)
} else printk("HPFS: You really don't want any checks? You are crazy...\n"); } else printk("HPFS: You really don't want any checks? You are crazy...\n");
/* Load code page table */ /* Load code page table */
if (spareblock->n_code_pages) if (le32_to_cpu(spareblock->n_code_pages))
if (!(sbi->sb_cp_table = hpfs_load_code_page(s, spareblock->code_page_dir))) if (!(sbi->sb_cp_table = hpfs_load_code_page(s, le32_to_cpu(spareblock->code_page_dir))))
printk("HPFS: Warning: code page support is disabled\n"); printk("HPFS: Warning: code page support is disabled\n");
brelse(bh2); brelse(bh2);
...@@ -642,13 +642,13 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent) ...@@ -642,13 +642,13 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)
if (!de) if (!de)
hpfs_error(s, "unable to find root dir"); hpfs_error(s, "unable to find root dir");
else { else {
root->i_atime.tv_sec = local_to_gmt(s, de->read_date); root->i_atime.tv_sec = local_to_gmt(s, le32_to_cpu(de->read_date));
root->i_atime.tv_nsec = 0; root->i_atime.tv_nsec = 0;
root->i_mtime.tv_sec = local_to_gmt(s, de->write_date); root->i_mtime.tv_sec = local_to_gmt(s, le32_to_cpu(de->write_date));
root->i_mtime.tv_nsec = 0; root->i_mtime.tv_nsec = 0;
root->i_ctime.tv_sec = local_to_gmt(s, de->creation_date); root->i_ctime.tv_sec = local_to_gmt(s, le32_to_cpu(de->creation_date));
root->i_ctime.tv_nsec = 0; root->i_ctime.tv_nsec = 0;
hpfs_i(root)->i_ea_size = de->ea_size; hpfs_i(root)->i_ea_size = le16_to_cpu(de->ea_size);
hpfs_i(root)->i_parent_dir = root->i_ino; hpfs_i(root)->i_parent_dir = root->i_ino;
if (root->i_size == -1) if (root->i_size == -1)
root->i_size = 2048; root->i_size = 2048;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment