ufs: fix nexstep dir block size
PATCH 1/1 ufs: fix nexstep dir block size
This patch fixes regression, introduced since 2.6.16. NextStep variant of UFS as OpenStep uses directory block size equals to 1024. Without this change, ufs_check_page fails in many cases.
Signed-off-by Evgeniy Dushistov <[email protected]>
Cc Dave Bailey <[email protected]>
---
fs/ufs/dir.c +1 -1
@@ -179,7 +179,7 @@ bad_entry: goto fail; Eend: p = (struct ufs_dir_entry *)(kaddr + offs); -ufs_error (sb,"ext2_check_page" , +ufs_error (sb, __FUNCTION__,"entry in directory #%lu spans the page boundary" "offset=%lu" , dir->i_ino, (page->index<<PAGE_CACHE_SHIFT )+offs);
fs/ufs/super.c +2 -2
@@ -755,13 +755,13 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)break ;case UFS_MOUNT_UFSTYPE_NEXTSTEP : -/*TODO: check may be we need set special dir block size?*/ UFSD ("ufstype=nextstep\n" ); uspi->s_fsize = block_size =1024 ; uspi->s_fmask = ~(1024 -1 ); uspi->s_fshift =10 ; uspi->s_sbsize = super_block_size =2048 ; uspi->s_sbbase =0 ; + uspi->s_dirblksize =1024 ; flags |=UFS_DE_OLD |UFS_UID_OLD |UFS_ST_OLD |UFS_CG_OLD ;if (!(sb->s_flags &MS_RDONLY )) {if (!silent)
@@ -771,13 +771,13 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)break ;case UFS_MOUNT_UFSTYPE_NEXTSTEP_CD : -/*TODO: check may be we need set special dir block size?*/ UFSD ("ufstype=nextstep-cd\n" ); uspi->s_fsize = block_size =2048 ; uspi->s_fmask = ~(2048 -1 ); uspi->s_fshift =11 ; uspi->s_sbsize = super_block_size =2048 ; uspi->s_sbbase =0 ; + uspi->s_dirblksize =1024 ; flags |=UFS_DE_OLD |UFS_UID_OLD |UFS_ST_OLD |UFS_CG_OLD ;if (!(sb->s_flags &MS_RDONLY )) {if (!silent)
Signature · 1 line
/Evgeniy