Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix block shift to work with different device block sizes. 

Unlike other filesystems this has some side issues because
the shift values are stored in the superblock and because
userland utitlies share the same fsbtodb macros.

-> the kernel now ignores the value stored in the superblock.
-> the macro adaption is only done for defined(_KERNEL) code.
This commit is contained in:
mlelstv 2010-01-31 10:54:10 +00:00
parent 5e340cd634
commit 748a0d77b1
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/ufs/ffs/ffs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ffs_vfsops.c,v 1.255 2010/01/31 10:50:23 mlelstv Exp $ */ /* $NetBSD: ffs_vfsops.c,v 1.256 2010/01/31 10:54:10 mlelstv Exp $ */
/*- /*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@ -61,7 +61,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.255 2010/01/31 10:50:23 mlelstv Exp $"); __KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.256 2010/01/31 10:54:10 mlelstv Exp $");
#if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT)
#include "opt_ffs.h" #include "opt_ffs.h"
@ -585,8 +585,6 @@ ffs_reload(struct mount *mp, kauth_cred_t cred, struct lwp *l)
struct fs *fs, *newfs; struct fs *fs, *newfs;
struct partinfo dpart; struct partinfo dpart;
int i, bsize, blks, error; int i, bsize, blks, error;
uint64_t numsecs;
unsigned secsize;
int32_t *lp; int32_t *lp;
struct ufsmount *ump; struct ufsmount *ump;
daddr_t sblockloc; daddr_t sblockloc;
@ -608,11 +606,9 @@ ffs_reload(struct mount *mp, kauth_cred_t cred, struct lwp *l)
* Step 2: re-read superblock from disk. * Step 2: re-read superblock from disk.
*/ */
fs = ump->um_fs; fs = ump->um_fs;
error = getdisksize(devvp, &numsecs, &secsize);
if (error)
secsize = DEV_BSIZE;
/* XXX we don't handle possibility that superblock moved. */ /* XXX we don't handle possibility that superblock moved. */
error = bread(devvp, fs->fs_sblockloc / secsize, fs->fs_sbsize, error = bread(devvp, fs->fs_sblockloc / DEV_BSIZE, fs->fs_sbsize,
NOCRED, 0, &bp); NOCRED, 0, &bp);
if (error) { if (error) {
brelse(bp, 0); brelse(bp, 0);
@ -665,7 +661,7 @@ ffs_reload(struct mount *mp, kauth_cred_t cred, struct lwp *l)
/* Manually look for an apple ufs label, and if a valid one /* Manually look for an apple ufs label, and if a valid one
* is found, then treat it like an Apple UFS filesystem anyway * is found, then treat it like an Apple UFS filesystem anyway
*/ */
error = bread(devvp, (daddr_t)(APPLEUFS_LABEL_OFFSET / secsize), error = bread(devvp, (daddr_t)(APPLEUFS_LABEL_OFFSET / DEV_BSIZE),
APPLEUFS_LABEL_SIZE, cred, 0, &bp); APPLEUFS_LABEL_SIZE, cred, 0, &bp);
if (error) { if (error) {
brelse(bp, 0); brelse(bp, 0);
@ -884,7 +880,7 @@ ffs_mountfs(struct vnode *devvp, struct mount *mp, struct lwp *l)
fs = NULL; fs = NULL;
goto out; goto out;
} }
error = bread(devvp, sblock_try[i] / secsize, SBLOCKSIZE, cred, error = bread(devvp, sblock_try[i] / DEV_BSIZE, SBLOCKSIZE, cred,
0, &bp); 0, &bp);
if (error) { if (error) {
fs = NULL; fs = NULL;
@ -1032,7 +1028,7 @@ ffs_mountfs(struct vnode *devvp, struct mount *mp, struct lwp *l)
/* Manually look for an apple ufs label, and if a valid one /* Manually look for an apple ufs label, and if a valid one
* is found, then treat it like an Apple UFS filesystem anyway * is found, then treat it like an Apple UFS filesystem anyway
*/ */
error = bread(devvp, (daddr_t)(APPLEUFS_LABEL_OFFSET / size), error = bread(devvp, (daddr_t)(APPLEUFS_LABEL_OFFSET / DEV_BSIZE),
APPLEUFS_LABEL_SIZE, cred, 0, &bp); APPLEUFS_LABEL_SIZE, cred, 0, &bp);
if (error) if (error)
goto out; goto out;
@ -1186,7 +1182,7 @@ ffs_mountfs(struct vnode *devvp, struct mount *mp, struct lwp *l)
ump->um_devvp = devvp; ump->um_devvp = devvp;
ump->um_nindir = fs->fs_nindir; ump->um_nindir = fs->fs_nindir;
ump->um_lognindir = ffs(fs->fs_nindir) - 1; ump->um_lognindir = ffs(fs->fs_nindir) - 1;
ump->um_bptrtodb = fs->fs_fsbtodb; ump->um_bptrtodb = fs->fs_fshift - DEV_BSHIFT;
ump->um_seqinc = fs->fs_frag; ump->um_seqinc = fs->fs_frag;
for (i = 0; i < MAXQUOTAS; i++) for (i = 0; i < MAXQUOTAS; i++)
ump->um_quotas[i] = NULLVP; ump->um_quotas[i] = NULLVP;

7
sys/ufs/ffs/fs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: fs.h,v 1.54 2009/06/28 09:26:18 ad Exp $ */ /* $NetBSD: fs.h,v 1.55 2010/01/31 10:54:10 mlelstv Exp $ */
/* /*
* Copyright (c) 1982, 1986, 1993 * Copyright (c) 1982, 1986, 1993
@ -599,8 +599,13 @@ struct ocg {
* Turn file system block numbers into disk block addresses. * Turn file system block numbers into disk block addresses.
* This maps file system blocks to device size blocks. * This maps file system blocks to device size blocks.
*/ */
#if defined (_KERNEL)
#define fsbtodb(fs, b) ((b) << ((fs)->fs_fshift - DEV_BSHIFT))
#define dbtofsb(fs, b) ((b) >> ((fs)->fs_fshift - DEV_BSHIFT))
#else
#define fsbtodb(fs, b) ((b) << (fs)->fs_fsbtodb) #define fsbtodb(fs, b) ((b) << (fs)->fs_fsbtodb)
#define dbtofsb(fs, b) ((b) >> (fs)->fs_fsbtodb) #define dbtofsb(fs, b) ((b) >> (fs)->fs_fsbtodb)
#endif
/* /*
* Cylinder group macros to locate things in cylinder groups. * Cylinder group macros to locate things in cylinder groups.