Commit 0ab7620a authored by Erik van der Kouwe's avatar Erik van der Kouwe Committed by Al Viro

fs/minix: bugfix, number of indirect block ptrs per block depends on block size

The MINIX filesystem driver used a constant number of indirect block
pointers in an indirect block. This worked only for filesystems with 1kb
block, while the MINIX default block size is now 4kb. As a consequence,
large files were read incorrectly on such filesystems and writing a
large file would cause the filesystem to become corrupted. This patch
computes the number of indirect block pointers based on the block size,
making the driver work for each block size.

I would like to thank Feiran Zheng ('Fam') for pointing out the cause
of the corruption.
Signed-off-by: default avatarErik van der Kouwe <vdkouwe@cs.vu.nl>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 1b061d92
...@@ -20,6 +20,9 @@ static inline block_t *i_data(struct inode *inode) ...@@ -20,6 +20,9 @@ static inline block_t *i_data(struct inode *inode)
return (block_t *)minix_i(inode)->u.i2_data; return (block_t *)minix_i(inode)->u.i2_data;
} }
#define DIRCOUNT 7
#define INDIRCOUNT(sb) (1 << ((sb)->s_blocksize_bits - 2))
static int block_to_path(struct inode * inode, long block, int offsets[DEPTH]) static int block_to_path(struct inode * inode, long block, int offsets[DEPTH])
{ {
int n = 0; int n = 0;
...@@ -34,21 +37,21 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH]) ...@@ -34,21 +37,21 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH])
printk("MINIX-fs: block_to_path: " printk("MINIX-fs: block_to_path: "
"block %ld too big on dev %s\n", "block %ld too big on dev %s\n",
block, bdevname(sb->s_bdev, b)); block, bdevname(sb->s_bdev, b));
} else if (block < 7) { } else if (block < DIRCOUNT) {
offsets[n++] = block; offsets[n++] = block;
} else if ((block -= 7) < 256) { } else if ((block -= DIRCOUNT) < INDIRCOUNT(sb)) {
offsets[n++] = 7; offsets[n++] = DIRCOUNT;
offsets[n++] = block; offsets[n++] = block;
} else if ((block -= 256) < 256*256) { } else if ((block -= INDIRCOUNT(sb)) < INDIRCOUNT(sb) * INDIRCOUNT(sb)) {
offsets[n++] = 8; offsets[n++] = DIRCOUNT + 1;
offsets[n++] = block>>8; offsets[n++] = block / INDIRCOUNT(sb);
offsets[n++] = block & 255; offsets[n++] = block % INDIRCOUNT(sb);
} else { } else {
block -= 256*256; block -= INDIRCOUNT(sb) * INDIRCOUNT(sb);
offsets[n++] = 9; offsets[n++] = DIRCOUNT + 2;
offsets[n++] = block>>16; offsets[n++] = (block / INDIRCOUNT(sb)) / INDIRCOUNT(sb);
offsets[n++] = (block>>8) & 255; offsets[n++] = (block / INDIRCOUNT(sb)) % INDIRCOUNT(sb);
offsets[n++] = block & 255; offsets[n++] = block % INDIRCOUNT(sb);
} }
return n; return n;
} }
......
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