*** /tmp/T00jZKIM Fri Sep 18 11:01:08 1998 --- ialloc.c Fri Apr 4 16:45:52 1997 *************** *** 431,436 **** --- 431,437 ---- inode->u.ext2_i.i_file_acl = 0; inode->u.ext2_i.i_dir_acl = 0; inode->u.ext2_i.i_dtime = 0; + inode->u.ext2_i.i_reserved_1 = 0; inode->u.ext2_i.i_block_group = i; inode->i_op = NULL; if (inode->u.ext2_i.i_flags & EXT2_SYNC_FL) *** /tmp/T00jZKIM Fri Sep 18 11:01:09 1998 --- inode.c Fri Apr 4 16:48:32 1997 *************** *** 473,478 **** --- 473,479 ---- inode->u.ext2_i.i_file_acl = le32_to_cpu(raw_inode->i_file_acl); inode->u.ext2_i.i_dir_acl = le32_to_cpu(raw_inode->i_dir_acl); inode->u.ext2_i.i_version = le32_to_cpu(raw_inode->i_version); + inode->u.ext2_i.i_reserved_1 = le32_to_cpu(raw_inode->i_reserved1); inode->u.ext2_i.i_block_group = block_group; inode->u.ext2_i.i_next_alloc_block = 0; inode->u.ext2_i.i_next_alloc_goal = 0; *************** *** 572,577 **** --- 573,579 ---- raw_inode->i_file_acl = cpu_to_le32(inode->u.ext2_i.i_file_acl); raw_inode->i_dir_acl = cpu_to_le32(inode->u.ext2_i.i_dir_acl); raw_inode->i_version = cpu_to_le32(inode->u.ext2_i.i_version); + raw_inode->i_reserved1 = cpu_to_le32(inodex->u.ext2_i.i_reserved_1); if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) raw_inode->i_block[0] = cpu_to_le32(kdev_t_to_nr(inode->i_rdev)); else if (S_ISLNK(inode->i_mode) && !inode->i_blocks) *** /tmp/T00jZKIM Fri Sep 18 11:01:09 1998 --- ioctl.c Mon Apr 7 19:30:34 1997 *************** *** 63,68 **** --- 63,71 ---- return -EPERM; if (IS_RDONLY(inode)) return -EROFS; + /* Disallow setting the version on AFS VICEMAGIC inodes */ + if (inode->u.ext2_i.i_flags & EXT2_VICEMAGIC_FL) + return -EINVAL; if (get_user(inode->u.ext2_i.i_version, (int *) arg)) return -EFAULT; inode->i_ctime = CURRENT_TIME; *** /tmp/T00hzcXY Fri Sep 18 11:01:10 1998 --- ext2_fs.h Fri Apr 4 16:39:58 1997 *************** *** 188,195 **** #define EXT2_SYNC_FL 0x00000008 /* Synchronous updates */ #define EXT2_IMMUTABLE_FL 0x00000010 /* Immutable file */ #define EXT2_APPEND_FL 0x00000020 /* writes to file may only append */ ! #define EXT2_NODUMP_FL 0x00000040 /* do not dump file */ ! #define EXT2_RESERVED_FL 0x80000000 /* reserved for ext2 lib */ /* * ioctl commands --- 188,196 ---- #define EXT2_SYNC_FL 0x00000008 /* Synchronous updates */ #define EXT2_IMMUTABLE_FL 0x00000010 /* Immutable file */ #define EXT2_APPEND_FL 0x00000020 /* writes to file may only append */ ! #define EXT2_NODUMP_FL 0x00000040 /* do not dump file */# ! #define EXT2_VICEMAGIC_FL 0x00000080 /* This is an AFS vice inode */ ! define EXT2_RESERVED_FL 0x80000000 /* reserved for ext2 lib */ /* * ioctl commands *** /tmp/T00hzcXY Fri Sep 18 11:01:10 1998 --- ext2_fs_i.h Fri Apr 4 16:45:35 1997 *************** *** 35,40 **** --- 35,41 ---- __u32 i_next_alloc_goal; __u32 i_prealloc_block; __u32 i_prealloc_count; + __u32 i_reserved_1; int i_new_inode:1; /* Is a freshly allocated inode */ };