[src/trunk]: src/sys Move struct salfs back inside libsa now that lfs_accesso...

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fa65924ed1f0
branches:  trunk
changeset: 339545:fa65924ed1f0
user:      dholland <dholland%NetBSD.org@localhost>
date:      Tue Jul 28 05:13:14 2015 +0000

description:
Move struct salfs back inside libsa now that lfs_accessors.h is separate.

diffstat:

 sys/lib/libsa/ufs.c |  12 ++++++++----
 sys/ufs/lfs/lfs.h   |  11 +----------
 2 files changed, 9 insertions(+), 14 deletions(-)

diffs (59 lines):

diff -r 657b9f62d063 -r fa65924ed1f0 sys/lib/libsa/ufs.c
--- a/sys/lib/libsa/ufs.c       Tue Jul 28 05:09:34 2015 +0000
+++ b/sys/lib/libsa/ufs.c       Tue Jul 28 05:13:14 2015 +0000
@@ -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 -r 657b9f62d063 -r fa65924ed1f0 sys/ufs/lfs/lfs.h
--- a/sys/ufs/lfs/lfs.h Tue Jul 28 05:09:34 2015 +0000
+++ b/sys/ufs/lfs/lfs.h Tue Jul 28 05:13:14 2015 +0000
@@ -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 @@
 };
 
 /*
- * 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.
  */