Attachment #87915 for bug #124621

View | Details | Raw Unified | Return to bug 124621
Collapse All | Expand All

Lines 150-156 Link Here

(-)ext2fs/ext2_fs.h (-1 / +1 lines)
150	#else /* !notyet */	150	#else /* !notyet */
151	#define EXT2_INODES_PER_BLOCK(s) ((s)->s_inodes_per_block)	151	#define EXT2_INODES_PER_BLOCK(s) ((s)->s_inodes_per_block)
152	/* Should be sizeof(struct ext2_inode): */	152	/* Should be sizeof(struct ext2_inode): */
153	#define EXT2_INODE_SIZE 128	153	#define EXT2_INODE_SIZE(s) ((s)->s_es->s_inode_size)
154	#define EXT2_FIRST_INO 11	154	#define EXT2_FIRST_INO 11
155	#endif /* notyet */	155	#endif /* notyet */
156		156

Lines 91-97 Link Here

(-)ext2fs/ext2_inode.c (-1 / +1 lines)
91	return (error);	91	return (error);
92	}	92	}
93	ext2_i2ei(ip, (struct ext2_inode )((char )bp->b_data +	93	ext2_i2ei(ip, (struct ext2_inode )((char )bp->b_data +
94	EXT2_INODE_SIZE * ino_to_fsbo(fs, ip->i_number)));	94	EXT2_INODE_SIZE(fs) * ino_to_fsbo(fs, ip->i_number)));
95	if (waitfor && (vp->v_mount->mnt_kern_flag & MNTK_ASYNC) == 0)	95	if (waitfor && (vp->v_mount->mnt_kern_flag & MNTK_ASYNC) == 0)
96	return (bwrite(bp));	96	return (bwrite(bp));
97	else {	97	else {




    V(s_frags_per_group)
    fs->s_inodes_per_group = es->s_inodes_per_group;
    V(s_inodes_per_group)
    fs->s_inodes_per_block = fs->s_blocksize / EXT2_INODE_SIZE(fs);
    V(s_inodes_per_block)
    fs->s_itb_per_group = fs->s_inodes_per_group /fs->s_inodes_per_block;
    V(s_itb_per_group)

			return (error);
		}
		ext2_ei2i((struct ext2_inode *) ((char *)bp->b_data +
		    EXT2_INODE_SIZE(fs) * ino_to_fsbo(fs, ip->i_number)), ip);
		brelse(bp);
		VOP_UNLOCK(vp, 0, td);
		vrele(vp);

		return (error);
	}
	/* convert ext2 inode to dinode */
	ext2_ei2i((struct ext2_inode *) ((char *)bp->b_data + EXT2_INODE_SIZE(fs) *
			ino_to_fsbo(fs, ino)), ip);
	ip->i_block_group = ino_to_cg(fs, ino);
	ip->i_next_alloc_block = 0;

Return to bug 124621

Lines 424-430 Link Here

(-)ext2fs/ext2_vfsops.c (-3 / +3 lines)
424	V(s_frags_per_group)	424	V(s_frags_per_group)
425	fs->s_inodes_per_group = es->s_inodes_per_group;	425	fs->s_inodes_per_group = es->s_inodes_per_group;
426	V(s_inodes_per_group)	426	V(s_inodes_per_group)
427	fs->s_inodes_per_block = fs->s_blocksize / EXT2_INODE_SIZE;	427	fs->s_inodes_per_block = fs->s_blocksize / EXT2_INODE_SIZE(fs);
428	V(s_inodes_per_block)	428	V(s_inodes_per_block)
429	fs->s_itb_per_group = fs->s_inodes_per_group /fs->s_inodes_per_block;	429	fs->s_itb_per_group = fs->s_inodes_per_group /fs->s_inodes_per_block;
430	V(s_itb_per_group)	430	V(s_itb_per_group)
Lines 578-584 Link Here
578	return (error);	578	return (error);
579	}	579	}
580	ext2_ei2i((struct ext2_inode ) ((char )bp->b_data +	580	ext2_ei2i((struct ext2_inode ) ((char )bp->b_data +
581	EXT2_INODE_SIZE * ino_to_fsbo(fs, ip->i_number)), ip);	581	EXT2_INODE_SIZE(fs) * ino_to_fsbo(fs, ip->i_number)), ip);
582	brelse(bp);	582	brelse(bp);
583	VOP_UNLOCK(vp, 0, td);	583	VOP_UNLOCK(vp, 0, td);
584	vrele(vp);	584	vrele(vp);
Lines 1013-1019 Link Here
1013	return (error);	1013	return (error);
1014	}	1014	}
1015	/* convert ext2 inode to dinode */	1015	/* convert ext2 inode to dinode */
1016	ext2_ei2i((struct ext2_inode ) ((char )bp->b_data + EXT2_INODE_SIZE *	1016	ext2_ei2i((struct ext2_inode ) ((char )bp->b_data + EXT2_INODE_SIZE(fs) *
1017	ino_to_fsbo(fs, ino)), ip);	1017	ino_to_fsbo(fs, ino)), ip);
1018	ip->i_block_group = ino_to_cg(fs, ino);	1018	ip->i_block_group = ino_to_cg(fs, ino);
1019	ip->i_next_alloc_block = 0;	1019	ip->i_next_alloc_block = 0;