Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/ufs/ffs - pull in ufsmount.h after inode.h, because the ...



details:   https://anonhg.NetBSD.org/src/rev/929810161243
branches:  trunk
changeset: 516623:929810161243
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Oct 26 06:37:55 2001 +0000

description:
- pull in ufsmount.h after inode.h, because the latter pulls in
  quota.h which the former needs, and this makes the usage consistent
  with other files anyway
- expand the details in a few panic strings

diffstat:

 sys/ufs/ffs/ffs_subr.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r c154b9744ae7 -r 929810161243 sys/ufs/ffs/ffs_subr.c
--- a/sys/ufs/ffs/ffs_subr.c    Fri Oct 26 06:24:08 2001 +0000
+++ b/sys/ufs/ffs/ffs_subr.c    Fri Oct 26 06:37:55 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_subr.c,v 1.17 2001/10/26 05:56:09 lukem Exp $      */
+/*     $NetBSD: ffs_subr.c,v 1.18 2001/10/26 06:37:55 lukem Exp $      */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -52,8 +52,8 @@
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/buf.h>
+#include <ufs/ufs/inode.h>
 #include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/inode.h>
 #include <ufs/ufs/ufs_extern.h>
 #include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
@@ -195,7 +195,7 @@
                mask = 0x01 << (h & 0x7);
                return ((cp[h >> 3] & mask) == mask);
        default:
-               panic("ffs_isblock");
+               panic("ffs_isblock: unknown fs_frag %d", (int)fs->fs_frag);
        }
 }
 
@@ -219,7 +219,7 @@
        case 1:
                return ((cp[h >> 3] & (0x01 << (h & 0x7))) == 0);
        default:
-               panic("ffs_isfreeblock");
+               panic("ffs_isfreeblock: unknown fs_frag %d", (int)fs->fs_frag);
        }
 }
 
@@ -247,7 +247,7 @@
                cp[h >> 3] &= ~(0x01 << (h & 0x7));
                return;
        default:
-               panic("ffs_clrblock");
+               panic("ffs_clrblock: unknown fs_frag %d", (int)fs->fs_frag);
        }
 }
 
@@ -276,6 +276,6 @@
                cp[h >> 3] |= (0x01 << (h & 0x7));
                return;
        default:
-               panic("ffs_setblock");
+               panic("ffs_setblock: unknown fs_frag %d", (int)fs->fs_frag);
        }
 }



Home | Main Index | Thread Index | Old Index