From 3358e5606999e83b0099efe70a8a71f2c2ca9c19 Mon Sep 17 00:00:00 2001 From: Evgeniy Dushistov Date: Tue, 4 Dec 2007 23:45:06 -0800 Subject: [PATCH] --- yaml --- r: 74584 b: refs/heads/master c: 0c664f974269bb4c3d38ba900c91a9a5d4cee5b1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ufs/dir.c | 2 +- trunk/fs/ufs/super.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f77ae7bb9856..6d149870f7d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 372a302e9a892229206aafca0352584a745bc5f3 +refs/heads/master: 0c664f974269bb4c3d38ba900c91a9a5d4cee5b1 diff --git a/trunk/fs/ufs/dir.c b/trunk/fs/ufs/dir.c index 30f8c2bb0c3e..aaf2878305ce 100644 --- a/trunk/fs/ufs/dir.c +++ b/trunk/fs/ufs/dir.c @@ -179,7 +179,7 @@ static void ufs_check_page(struct page *page) 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<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)