From 973eb9900a59192abdc17e9ac48181e64ff30bb4 Mon Sep 17 00:00:00 2001 From: dholland Date: Tue, 28 Jul 2015 05:13:14 +0000 Subject: Move struct salfs back inside libsa now that lfs_accessors.h is separate. --- sys/lib/libsa/ufs.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'sys/lib') diff --git a/sys/lib/libsa/ufs.c b/sys/lib/libsa/ufs.c index f33af260cab..14ae5958c49 100644 --- a/sys/lib/libsa/ufs.c +++ b/sys/lib/libsa/ufs.c @@ -1,4 +1,4 @@ -/* $NetBSD: ufs.c,v 1.68 2015/07/28 05:09:34 dholland Exp $ */ +/* $NetBSD: ufs.c,v 1.69 2015/07/28 05:13:14 dholland Exp $ */ /*- * Copyright (c) 1993 @@ -71,8 +71,6 @@ #include #include /* XXX for MNAMELEN */ #include -#define STRUCT_LFS struct salfs -#include #else #include #endif @@ -104,8 +102,14 @@ #ifdef LIBSA_LFS /* * In-core LFS superblock - just the on-disk one. - * XXX: struct salfs is currently in lfs.h */ +struct salfs { + struct dlfs lfs_dlfs; +}; +/* Get lfs accessors that use struct salfs. */ +#define STRUCT_LFS struct salfs +#include + typedef struct salfs FS; #define fs_magic lfs_dlfs.dlfs_magic #define fs_maxsymlinklen lfs_dlfs.dlfs_maxsymlinklen -- cgit