summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authordholland <dholland@NetBSD.org>2015-07-28 05:13:14 +0000
committerdholland <dholland@NetBSD.org>2015-07-28 05:13:14 +0000
commit973eb9900a59192abdc17e9ac48181e64ff30bb4 (patch)
tree079f14c531bf07dc43119c8b73f7c8b374b51654 /sys
parent835d124213d0a56130b20239f7d890554cc0665f (diff)
Move struct salfs back inside libsa now that lfs_accessors.h is separate.
Diffstat (limited to 'sys')
-rw-r--r--sys/lib/libsa/ufs.c12
-rw-r--r--sys/ufs/lfs/lfs.h11
2 files changed, 9 insertions, 14 deletions
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 <sys/condvar.h>
#include <sys/mount.h> /* XXX for MNAMELEN */
#include <ufs/lfs/lfs.h>
-#define STRUCT_LFS struct salfs
-#include <ufs/lfs/lfs_accessors.h>
#else
#include <ufs/ffs/fs.h>
#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 <ufs/lfs/lfs_accessors.h>
+
typedef struct salfs FS;
#define fs_magic lfs_dlfs.dlfs_magic
#define fs_maxsymlinklen lfs_dlfs.dlfs_maxsymlinklen
diff --git a/sys/ufs/lfs/lfs.h b/sys/ufs/lfs/lfs.h
index dd0404e446c..da5f3938956 100644
--- a/sys/ufs/lfs/lfs.h
+++ b/sys/ufs/lfs/lfs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.h,v 1.166 2015/07/28 05:09:34 dholland Exp $ */
+/* $NetBSD: lfs.h,v 1.167 2015/07/28 05:13:14 dholland Exp $ */
/* from NetBSD: dinode.h,v 1.22 2013/01/22 09:39:18 dholland Exp */
/* from NetBSD: dir.h,v 1.21 2009/07/22 04:49:19 dholland Exp */
@@ -758,15 +758,6 @@ struct lfs {
};
/*
- * Smaller "struct lfs" used by libsa. XXX: this should not need to be
- * exposed here, but currently it must be in order for the superblock
- * accessors to work. Blah.
- */
-struct salfs {
- struct dlfs lfs_dlfs;
-};
-
-/*
* Structures used by lfs_bmapv and lfs_markv to communicate information
* about inodes and data blocks.
*/