Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
NetBSD/sys/lib/libsa/lfsv1.c

31 lines
778 B
C
Raw Normal View History

Hack up dinode usage to be 64 vs. 32 as needed. Part 1. (This part changes the native lfs code; the ufs-derived code already has 64 vs. 32 logic, but as aspects of it are unsafe, and don't entirely interoperate cleanly with the lfs 64/32 stuff, pass 2 will be rehashing that.)
2015-08-12 21:28:00 +03:00
/* $NetBSD: lfsv1.c,v 1.14 2015/08/12 18:28:01 dholland Exp $ */
Add support for LFSv2 filesystems. From a libsa standpoint, LFSv1 and LFSv2 are treated as separate filesystem types for size considerations.
2003-02-24 02:17:42 +03:00
Use common ffs/lfs file ufs.c instead of lfs specific version.
2003-04-11 15:27:06 +04:00
#define LIBSA_LFS
#define REQUIRED_LFS_VERSION 1
#define ufs_open lfsv1_open
#define ufs_close lfsv1_close
#define ufs_read lfsv1_read
#define ufs_write lfsv1_write
#define ufs_seek lfsv1_seek
#define ufs_stat lfsv1_stat
Apply the following patch submitted by Evgeniy Ivanov: http://mail-index.NetBSD.org/tech-kern/2011/12/15/msg012226.html http://mail-index.NetBSD.org/tech-kern/2011/12/17/msg012229.html - add 'ls' op to struct fs_ops to support ls command on each fs, enabled by -DLIBSA_ENABLE_LS_OP and SAMISCMAKEFLAGS+="SA_ENABLE_LS_OP=yes" in libsa - split sys/lib/libsa/ufs_ls.c into UFS specific part and MI part (ls.c) that opens the target fs and calls fs-depedent XXX_ls() functions - add a ls op for ext2fs (all other fs than ufs and ext2fs don't have actual ls ops yet) - replace existing MD ufs_ls() calls with this new MI ls() The original patch was written for i386 and ext2fs. zaurus zboot has been tested by nonaka@. ews4800mips and x68k loaders have been tested by me (with several fixes). landisk might be okay since it was almost copied from i386. XXX1: "ls" op in fs_ops looks a bit inconsistent, but we will be able to replace it with real fs ops like readdir if it's really worth XXX2: someone might have to check sys/arch/ia64/stand/efi/libefi/efifs_ls.c
2011-12-25 10:09:08 +04:00
#if defined(LIBSA_ENABLE_LS_OP)
#define ufs_ls lfsv1_ls
#endif
Use common ffs/lfs file ufs.c instead of lfs specific version.
2003-04-11 15:27:06 +04:00
Hack up dinode usage to be 64 vs. 32 as needed. Part 1. (This part changes the native lfs code; the ufs-derived code already has 64 vs. 32 logic, but as aspects of it are unsafe, and don't entirely interoperate cleanly with the lfs 64/32 stuff, pass 2 will be rehashing that.)
2015-08-12 21:28:00 +03:00
#define ufs_dinode lfs32_dinode
Build properly against the lfs changes.
2013-06-09 04:02:33 +04:00
Add a (draft) 64-bit superblock. Make things build again. Add pieces of support for using both superblock types where convenient, and specifically to the superblock accessors, but don't actually enable it anywhere. First substantive step on PR 50000.
2015-08-02 21:18:09 +03:00
#define fs_bsize lfs_dlfs_u.u_32.dlfs_ibsize
Use common ffs/lfs file ufs.c instead of lfs specific version.
2003-04-11 15:27:06 +04:00
Prefix most of the cpp macros with lfs_ and LFS_ to avoid conflicts with ffs. This was done so that boot blocks that want to compile both FFS and LFS in the same file work.
2013-06-18 22:18:57 +04:00
#define INOPBx(fs) LFS_INOPB(fs)
Switch to accessor functions for elements of the LFS on-disk superblock. This will allow switching between 32/64 bit forms on the fly; it will also allow handling LFS_EI reasonably tidily. (That currently doesn't work on the superblock.) It also gets rid of cpp abuse in the form of fake structure member macros. Also, instead of doing sleep/wakeup on &lfs_avail and &lfs_nextseg inside the on-disk superblock, add extra elements to the in-memory struct lfs for this. (XXX: these should be changed to condvars, but not right now) XXX: this migrates a structure needed by the lfs code in libsa (struct salfs) into lfs.h, where it doesn't belong, but for the time being this is necessary in order to allow the accessors (and the various lfs macros and other goop that relies on them) to compile.
2015-07-24 09:56:41 +03:00
#define UFS_NINDIR LFS_NINDIR
Rename ambiguous macros: MAXDIRSIZE -> UFS_MAXDIRSIZE or LFS_MAXDIRSIZE NINDIR -> FFS_NINDIR, EXT2_NINDIR, LFS_NINDIR, or MFS_NINDIR INOPB -> FFS_INOPB, LFS_INOPB INOPF -> FFS_INOPF, LFS_INOPF blksize -> ffs_blksize, ext2_blksize, or lfs_blksize sblksize -> ffs_blksize These are not the only ambiguously defined filesystem macros, of course, there's a pile more. I may not have found all the ambiguous definitions of blksize(), too, as there are a lot of other things called 'blksize' in the system.
2013-06-19 21:51:25 +04:00
#define ufs_blkoff(a, b) lfs_blkoff((a), (b))
Stick ffs_, ext2_, chfs_, filecore_, cd9660_, or mfs_ in front of the following symbols so as to disambiguate fully. (Christos already did the lfs ones.) lblkno lblktosize lfragtosize numfrags blkroundup fragroundup
2013-06-23 11:28:36 +04:00
#define ufs_lblkno(a, b) lfs_lblkno((a), (b))
Prefix most of the cpp macros with lfs_ and LFS_ to avoid conflicts with ffs. This was done so that boot blocks that want to compile both FFS and LFS in the same file work.
2013-06-18 22:18:57 +04:00
#define dblksize(a, b, c) lfs_dblksize((a), (b), (c))
Rename ambiguous macros: MAXDIRSIZE -> UFS_MAXDIRSIZE or LFS_MAXDIRSIZE NINDIR -> FFS_NINDIR, EXT2_NINDIR, LFS_NINDIR, or MFS_NINDIR INOPB -> FFS_INOPB, LFS_INOPB INOPF -> FFS_INOPF, LFS_INOPF blksize -> ffs_blksize, ext2_blksize, or lfs_blksize sblksize -> ffs_blksize These are not the only ambiguously defined filesystem macros, of course, there's a pile more. I may not have found all the ambiguous definitions of blksize(), too, as there are a lot of other things called 'blksize' in the system.
2013-06-19 21:51:25 +04:00
#define FSBTODB(fs, daddr) (daddr) /* LFSv1 uses sectors for addresses */
Use common ffs/lfs file ufs.c instead of lfs specific version.
2003-04-11 15:27:06 +04:00
For the x86 boot loader, autoload a kernel module corresponding to the root file system type.
2008-11-19 15:36:41 +03:00
#define FSMOD "lfs"
Use common ffs/lfs file ufs.c instead of lfs specific version.
2003-04-11 15:27:06 +04:00
#include "lib/libsa/ufs.c"