From 9ab4cfc599f2bb01d344682400024b046db1c524 Mon Sep 17 00:00:00 2001 From: bde Date: Sat, 1 Jan 2000 17:39:21 +0000 Subject: Merged changes in ext2_fs.h between Linux 1.2.2 and Linux 2.3.35. The main changes are: - many things are more dynamic; e.g., the inode size is a new parameter in the superblock instead of a constant. - extensions are controlled by new flags in the superblock. - directory entries may have a file type field. These changes are not used yet, except for a spelling change which affects ext2_cnv.c --- sys/gnu/fs/ext2fs/ext2_inode_cnv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/gnu/fs/ext2fs/ext2_inode_cnv.c') diff --git a/sys/gnu/fs/ext2fs/ext2_inode_cnv.c b/sys/gnu/fs/ext2fs/ext2_inode_cnv.c index ab8ceb1..3e8e0ff 100644 --- a/sys/gnu/fs/ext2fs/ext2_inode_cnv.c +++ b/sys/gnu/fs/ext2fs/ext2_inode_cnv.c @@ -112,7 +112,7 @@ ext2_ei2di(ei, di) di->di_flags |= (ei->i_flags & EXT2_APPEND_FL) ? APPEND : 0; di->di_flags |= (ei->i_flags & EXT2_IMMUTABLE_FL) ? IMMUTABLE : 0; di->di_blocks = ei->i_blocks; - di->di_gen = ei->i_version; /* XXX is that true ??? */ + di->di_gen = ei->i_generation; di->di_uid = ei->i_uid; di->di_gid = ei->i_gid; /* XXX use memcpy */ @@ -149,7 +149,7 @@ ext2_di2ei(di, ei) ei->i_flags |= (di->di_flags & IMMUTABLE) ? EXT2_IMMUTABLE_FL: 0; ei->i_blocks = di->di_blocks; - ei->i_version = di->di_gen; /* XXX is that true ??? */ + ei->i_generation = di->di_gen; ei->i_uid = di->di_uid; ei->i_gid = di->di_gid; /* XXX use memcpy */ -- cgit v1.1