[src/trunk]: src/sys/ufs/lfs Move more symbols to lfs.h:

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

details:   https://anonhg.NetBSD.org/src/rev/a78d40c08444
branches:  trunk
changeset: 787245:a78d40c08444
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sat Jun 08 02:15:12 2013 +0000

description:
Move more symbols to lfs.h:
   LFS_DIRBLKSIZ
   LFS_DIRECTSIZ
   LFS_DIRSIZ
   LFS_OLDDIRFMT
   LFS_NEWDIRFMT
   LFS_IFTODT
   LFS_DTTOIF
   ULFS{,1,2}_MAXSYMLINKLEN

diffstat:

 sys/ufs/lfs/lfs.h         |  16 +++++++++++++++-
 sys/ufs/lfs/ulfs_dinode.h |  12 +-----------
 sys/ufs/lfs/ulfs_dir.h    |   5 +----
 3 files changed, 17 insertions(+), 16 deletions(-)

diffs (80 lines):

diff -r 48a33fd7e44a -r a78d40c08444 sys/ufs/lfs/lfs.h
--- a/sys/ufs/lfs/lfs.h Sat Jun 08 02:14:46 2013 +0000
+++ b/sys/ufs/lfs/lfs.h Sat Jun 08 02:15:12 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs.h,v 1.146 2013/06/08 02:14:46 dholland Exp $       */
+/*     $NetBSD: lfs.h,v 1.147 2013/06/08 02:15:12 dholland Exp $       */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -258,6 +258,10 @@
     LFS_DIRECTSIZ((dp)->d_type) : LFS_DIRECTSIZ((dp)->d_namlen))
 #endif
 
+/* Constants for the first argument of LFS_DIRSIZ */
+#define LFS_OLDDIRFMT  1
+#define LFS_NEWDIRFMT  0
+
 /*
  * Theoretically, directories can be more than 2Gb in length; however, in
  * practice this seems unlikely. So, we define the type doff_t as a 32-bit
@@ -415,6 +419,16 @@
 #define        LFS_IFWHT       0160000         /* Whiteout. */
 
 /*
+ * Maximum length of a symlink that can be stored within the inode.
+ */
+#define ULFS1_MAXSYMLINKLEN    ((ULFS_NDADDR + ULFS_NIADDR) * sizeof(int32_t))
+#define ULFS2_MAXSYMLINKLEN    ((ULFS_NDADDR + ULFS_NIADDR) * sizeof(int64_t))
+
+#define ULFS_MAXSYMLINKLEN(ip) \
+       ((ip)->i_ump->um_fstype == ULFS1) ? \
+       ULFS1_MAXSYMLINKLEN : ULFS2_MAXSYMLINKLEN
+
+/*
  * "struct buf" associated definitions
  */
 
diff -r 48a33fd7e44a -r a78d40c08444 sys/ufs/lfs/ulfs_dinode.h
--- a/sys/ufs/lfs/ulfs_dinode.h Sat Jun 08 02:14:46 2013 +0000
+++ b/sys/ufs/lfs/ulfs_dinode.h Sat Jun 08 02:15:12 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ulfs_dinode.h,v 1.9 2013/06/08 02:13:33 dholland Exp $ */
+/*     $NetBSD: ulfs_dinode.h,v 1.10 2013/06/08 02:15:12 dholland Exp $        */
 /*  from NetBSD: dinode.h,v 1.22 2013/01/22 09:39:18 dholland Exp  */
 
 /*
@@ -55,16 +55,6 @@
 
 #include <ufs/lfs/lfs.h>
 
-/*
- * Maximum length of a symlink that can be stored within the inode.
- */
-#define ULFS1_MAXSYMLINKLEN    ((ULFS_NDADDR + ULFS_NIADDR) * sizeof(int32_t))
-#define ULFS2_MAXSYMLINKLEN    ((ULFS_NDADDR + ULFS_NIADDR) * sizeof(int64_t))
-
-#define ULFS_MAXSYMLINKLEN(ip) \
-       ((ip)->i_ump->um_fstype == ULFS1) ? \
-       ULFS1_MAXSYMLINKLEN : ULFS2_MAXSYMLINKLEN
-
 /* File permissions. */
 #define        IEXEC           0000100         /* Executable. */
 #define        IWRITE          0000200         /* Writable. */
diff -r 48a33fd7e44a -r a78d40c08444 sys/ufs/lfs/ulfs_dir.h
--- a/sys/ufs/lfs/ulfs_dir.h    Sat Jun 08 02:14:46 2013 +0000
+++ b/sys/ufs/lfs/ulfs_dir.h    Sat Jun 08 02:15:12 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ulfs_dir.h,v 1.7 2013/06/08 02:14:46 dholland Exp $    */
+/*     $NetBSD: ulfs_dir.h,v 1.8 2013/06/08 02:15:12 dholland Exp $    */
 /*  from NetBSD: dir.h,v 1.21 2009/07/22 04:49:19 dholland Exp  */
 
 /*
@@ -40,7 +40,4 @@
 #ifndef _UFS_LFS_ULFS_DIR_H_
 #define        _UFS_LFS_ULFS_DIR_H_
 
-#define LFS_OLDDIRFMT  1
-#define LFS_NEWDIRFMT  0
-
 #endif /* !_UFS_LFS_ULFS_DIR_H_ */