This is the same patch published about 72 hours ago for testing,
slightly modified to fit the old version of the Linux kernel -which
still is widely used.
I wait for feedback and suggestions before finally posting both patches
to the linux-kernel mailing list.
==================
diff -ur orig.linux-2.4.32/fs/minix/bitmap.c
updated.linux-2.4.32/fs/minix/bitmap.c
--- orig.linux-2.4.32/fs/minix/bitmap.c 2002-02-25 20:38:09.000000000
+0100
+++ updated.linux-2.4.32/fs/minix/bitmap.c 2006-01-14
20:57:54.000000000 +0100
@@ -27,14 +27,14 @@
for (i=0; i<numblocks-1; i++) {
if (!(bh=map[i]))
return(0);
- for (j=0; j<BLOCK_SIZE; j++)
+ for (j=0; j<bh->b_size; j++)
sum += nibblemap[bh->b_data[j] & 0xf]
+ nibblemap[(bh->b_data[j]>>4) & 0xf];
}
if (numblocks==0 || !(bh=map[numblocks-1]))
return(0);
- i = ((numbits-(numblocks-1)*BLOCK_SIZE*8)/16)*2;
+ i = ((numbits-(numblocks-1)*bh->b_size*8)/16)*2;
for (j=0; j<i; j++) {
sum += nibblemap[bh->b_data[j] & 0xf]
+ nibblemap[(bh->b_data[j]>>4) & 0xf];
@@ -157,14 +157,14 @@
}
ino--;
block = 2 + sbi->s_imap_blocks + sbi->s_zmap_blocks +
- ino / MINIX2_INODES_PER_BLOCK;
+ ino / MINIX2_INODES_PER_BLOCK(sb->s_blocksize);
*bh = sb_bread(sb, block);
if (!*bh) {
printk("unable to read i-node block\n");
return NULL;
}
p = (void *)(*bh)->b_data;
- return p + ino % MINIX2_INODES_PER_BLOCK;
+ return p + ino % MINIX2_INODES_PER_BLOCK(sb->s_blocksize);
}
/* Clear the link count and mode of a deleted inode on disk. */
diff -ur orig.linux-2.4.32/fs/minix/dir.c
updated.linux-2.4.32/fs/minix/dir.c
--- orig.linux-2.4.32/fs/minix/dir.c 2002-02-25 20:38:09.000000000
+0100
+++ updated.linux-2.4.32/fs/minix/dir.c 2006-01-14 20:57:54.000000000
+0100
@@ -4,6 +4,9 @@
* Copyright (C) 1991, 1992 Linus Torvalds
*
* minix directory handling functions
+ *
+ * Updated to filesystem version 3 by Daniel Aragones
+ *
*/
#include <linux/fs.h>
@@ -11,6 +14,7 @@
#include <linux/pagemap.h>
typedef struct minix_dir_entry minix_dirent;
+typedef struct minix3_dir_entry minix3_dirent;
static int minix_readdir(struct file *, void *, filldir_t);
@@ -95,14 +99,22 @@
limit = kaddr + PAGE_CACHE_SIZE - chunk_size;
for ( ; p <= limit ; p = minix_next_entry(p, sbi)) {
minix_dirent *de = (minix_dirent *)p;
+ minix3_dirent *de3 = (minix3_dirent *)p;
if (de->inode) {
int over;
- unsigned l = strnlen(de->name,sbi->s_namelen);
-
- offset = p - kaddr;
- over = filldir(dirent, de->name, l,
- (n<<PAGE_CACHE_SHIFT) | offset,
- de->inode, DT_UNKNOWN);
+ if (!(sbi->s_version == MINIX_V3)) {
+ unsigned l = strnlen(de->name,sbi->s_namelen);
+ offset = p - kaddr;
+ over = filldir(dirent, de->name, l,
+ (n<<PAGE_CACHE_SHIFT) | offset,
+ de->inode, DT_UNKNOWN);
+ } else {
+ unsigned l = strnlen(de3->name,sbi->s_namelen);
+ offset = p - kaddr;
+ over = filldir(dirent, de3->name, l,
+ (n<<PAGE_CACHE_SHIFT) | offset,
+ de3->inode, DT_UNKNOWN);
+ }
if (over) {
dir_put_page(page);
goto done;
@@ -145,7 +157,7 @@
unsigned long npages = dir_pages(dir);
struct page *page = NULL;
struct minix_dir_entry *de;
-
+ struct minix3_dir_entry *de3;
*res_page = NULL;
for (n = 0; n < npages; n++) {
@@ -156,12 +168,22 @@
kaddr = (char*)page_address(page);
de = (struct minix_dir_entry *) kaddr;
+ de3 = (struct minix3_dir_entry *) kaddr;
kaddr += PAGE_CACHE_SIZE - sbi->s_dirsize;
- for ( ; (char *) de <= kaddr ; de = minix_next_entry(de,sbi)) {
- if (!de->inode)
- continue;
- if (namecompare(namelen,sbi->s_namelen,name,de->name))
- goto found;
+ for ( ; (char *) de <= kaddr ;
+ de = minix_next_entry(de,sbi),
+ de3 = minix_next_entry(de3,sbi)) {
+ if (!(sbi->s_version == MINIX_V3)) {
+ if (!de->inode)
+ continue;
+ if (namecompare(namelen,sbi->s_namelen,name,de->name))
+ goto found;
+ } else {
+ if (!de3->inode)
+ continue;
+ if (namecompare(namelen,sbi->s_namelen,name,de3->name))
+ goto found;
+ }
}
dir_put_page(page);
}
@@ -181,6 +203,7 @@
struct minix_sb_info * sbi = &sb->u.minix_sb;
struct page *page = NULL;
struct minix_dir_entry * de;
+ struct minix3_dir_entry * de3;
unsigned long npages = dir_pages(dir);
unsigned long n;
char *kaddr;
@@ -195,14 +218,22 @@
goto out;
kaddr = (char*)page_address(page);
de = (minix_dirent *)kaddr;
+ de3 = (minix3_dirent *)kaddr;
kaddr += PAGE_CACHE_SIZE - sbi->s_dirsize;
while ((char *)de <= kaddr) {
if (!de->inode)
goto got_it;
err = -EEXIST;
- if (namecompare(namelen,sbi->s_namelen,name,de->name))
- goto out_page;
- de = minix_next_entry(de, sbi);
+ if (!(sbi->s_version == MINIX_V3)) {
+ if (namecompare(namelen,sbi->s_namelen,name,de->name))
+ goto out_page;
+ de = minix_next_entry(de, sbi);
+ } else {
+ if (namecompare(namelen,sbi->s_namelen,name,de3->name))
+ goto out_unlock;
+ de = minix_next_entry(de, sbi);
+ de3 = minix_next_entry(de3, sbi);
+ }
}
dir_put_page(page);
}
@@ -216,9 +247,15 @@
err = page->mapping->a_ops->prepare_write(NULL, page, from, to);
if (err)
goto out_unlock;
- memcpy (de->name, name, namelen);
- memset (de->name + namelen, 0, sbi->s_dirsize - namelen - 2);
- de->inode = inode->i_ino;
+ if (!(sbi->s_version == MINIX_V3)) {
+ memcpy (de->name, name, namelen);
+ memset (de->name + namelen, 0, sbi->s_dirsize - namelen - 2);
+ de->inode = inode->i_ino;
+ } else {
+ memcpy (de3->name, name, namelen);
+ memset (de3->name + namelen, 0, sbi->s_dirsize - namelen - 4);
+ de3->inode = inode->i_ino;
+ }
err = dir_commit_chunk(page, from, to);
dir->i_mtime = dir->i_ctime = CURRENT_TIME;
mark_inode_dirty(dir);
@@ -258,6 +295,7 @@
struct page *page = grab_cache_page(mapping, 0);
struct minix_sb_info * sbi = &inode->i_sb->u.minix_sb;
struct minix_dir_entry * de;
+ struct minix3_dir_entry * de3;
char *base;
int err;
@@ -269,13 +307,14 @@
base = (char*)page_address(page);
memset(base, 0, PAGE_CACHE_SIZE);
-
- de = (struct minix_dir_entry *) base;
- de->inode = inode->i_ino;
- strcpy(de->name,".");
+ de = (struct minix_dir_entry *)base;
+ de3 = (struct minix3_dir_entry *)base;
+ de->inode = de3->inode = inode->i_ino;
+ (sbi->s_version == MINIX_V3) ? strcpy(de3->name,".") :
strcpy(de->name,".");
de = minix_next_entry(de, sbi);
- de->inode = dir->i_ino;
- strcpy(de->name,"..");
+ de3 = minix_next_entry(de3, sbi);
+ de->inode = de3->inode = dir->i_ino;
+ (sbi->s_version == MINIX_V3) ? strcpy(de3->name,"..") :
strcpy(de->name,"..");
err = dir_commit_chunk(page, 0, 2 * sbi->s_dirsize);
fail:
@@ -296,27 +335,42 @@
for (i = 0; i < npages; i++) {
char *kaddr;
minix_dirent * de;
+ minix3_dirent * de3 = NULL;
page = dir_get_page(inode, i);
if (IS_ERR(page))
continue;
kaddr = (char *)page_address(page);
+ if (sbi->s_version == MINIX_V3)
+ de3 = (minix3_dirent *)kaddr;
de = (minix_dirent *)kaddr;
kaddr += PAGE_CACHE_SIZE - sbi->s_dirsize;
while ((char *)de <= kaddr) {
if (de->inode != 0) {
/* check for . and .. */
- if (de->name[0] != '.')
- goto not_empty;
- if (!de->name[1]) {
- if (de->inode != inode->i_ino)
+ if (!(sbi->s_version == MINIX_V3)) {
+ if (de->name[0] != '.')
+ goto not_empty;
+ if (!de->name[1]) {
+ if (de->inode != inode->i_ino)
+ goto not_empty;
+ } else if (de->name[1] != '.')
+ goto not_empty;
+ else if (de->name[2])
goto not_empty;
- } else if (de->name[1] != '.')
- goto not_empty;
- else if (de->name[2])
- goto not_empty;
+ } else {
+ if (de3->name[0] != '.')
+ goto not_empty;
+ if (!de3->name[1]) {
+ if (de3->inode != inode->i_ino)
+ goto not_empty;
+ } else if (de3->name[1] != '.')
+ goto not_empty;
+ else if (de3->name[2])
+ goto not_empty;
+ }
}
de = minix_next_entry(de, sbi);
}
diff -ur orig.linux-2.4.32/fs/minix/inode.c
updated.linux-2.4.32/fs/minix/inode.c
--- orig.linux-2.4.32/fs/minix/inode.c 2003-11-28 19:26:21.000000000
+0100
+++ updated.linux-2.4.32/fs/minix/inode.c 2006-01-14 20:57:55.000000000
+0100
@@ -7,6 +7,7 @@
* Minix V2 fs support.
*
* Modified for 680x0 by Andreas Schwab
+ * Updated to filesystem version 3 by Daniel Aragones
*/
#include <linux/module.h>
@@ -28,7 +29,7 @@
static void minix_delete_inode(struct inode *inode)
{
lock_kernel();
-
+ truncate_inode_pages(&inode->i_data, 0);
inode->i_size = 0;
minix_truncate(inode);
minix_free_inode(inode);
@@ -45,23 +46,24 @@
static void minix_write_super(struct super_block * sb)
{
struct minix_super_block * ms;
+ struct minix_sb_info *sbi = &sb->u.minix_sb;
if (!(sb->s_flags & MS_RDONLY)) {
ms = sb->u.minix_sb.s_ms;
-
- if (ms->s_state & MINIX_VALID_FS)
- ms->s_state &= ~MINIX_VALID_FS;
- minix_commit_super(sb);
+ if (sbi->s_version != MINIX_V3) { /* s_state is out from V3 sb */
+ if (ms->s_state & MINIX_VALID_FS)
+ ms->s_state &= ~MINIX_VALID_FS;
+ minix_commit_super(sb);
+ }
}
sb->s_dirt = 0;
}
-
static void minix_put_super(struct super_block *sb)
{
int i;
-
- if (!(sb->s_flags & MS_RDONLY)) {
+ struct minix_sb_info *sbi = &sb->u.minix_sb;
+ if (!(sb->s_flags & MS_RDONLY) && (sbi->s_version != MINIX_V3)) {
sb->u.minix_sb.s_ms->s_state = sb->u.minix_sb.s_mount_state;
mark_buffer_dirty(sb->u.minix_sb.s_sbh);
}
@@ -88,11 +90,12 @@
static int minix_remount (struct super_block * sb, int * flags, char *
data)
{
struct minix_super_block * ms;
+ struct minix_sb_info *sbi = &sb->u.minix_sb;
ms = sb->u.minix_sb.s_ms;
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
return 0;
- if (*flags & MS_RDONLY) {
+ if ((*flags & MS_RDONLY) && (sbi->s_version != MINIX_V3)){
if (ms->s_state & MINIX_VALID_FS ||
!(sb->u.minix_sb.s_mount_state & MINIX_VALID_FS))
return 0;
@@ -102,20 +105,21 @@
...
read more »
