STABLE12-solaris-fs-rolled-20030328

for solaris 9 u2

(cherry picked from commit b9eb8cc6695a0dc903b10cd763041f5cfd6a1764)

diff --git a/acconfig.h b/acconfig.h
index cb6acbf8ee868224b654d53866ff02831ac412d6..679dd81add25a8df0ad01591dc1b409bc2ca87ce 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -40,6 +40,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #undef RECALC_SIGPENDING_TAKES_VOID
 #undef STRUCT_ADDRESS_SPACE_HAS_GFP_MASK
 #undef STRUCT_ADDRESS_SPACE_HAS_PAGE_LOCK
+#undef STRUCT_FS_HAS_FS_ROLLED
 #undef STRUCT_INODE_HAS_I_DEVICES
 #undef STRUCT_INODE_HAS_I_DIRTY_DATA_BUFFERS
 #undef STRUCT_INODE_HAS_I_TRUNCATE_SEM

diff --git a/acinclude.m4 b/acinclude.m4
index b7180ddc82cb7aead37cd9f190bb85472ec4fa26..1a71adce3ee93c69775771cc9dcd658d23e3c8ec 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -255,6 +255,7 @@ case $system in
                 AC_MSG_RESULT(sun4)
                SOLARIS_UFSVFS_HAS_DQRWLOCK
                SOLARIS_PROC_HAS_P_COREFILE
+               SOLARIS_FS_HAS_FS_ROLLED
                 ;;
         *-sunos*)
                MKAFS_OSTYPE=SUNOS

diff --git a/src/cf/solaris-fs-rolled.m4 b/src/cf/solaris-fs-rolled.m4
new file mode 100644 (file)
index 0000000..01d78d0
--- /dev/null
+++ b/src/cf/solaris-fs-rolled.m4
@@ -0,0 +1,16 @@
+AC_DEFUN(SOLARIS_FS_HAS_FS_ROLLED, [
+AC_MSG_CHECKING(for fs_rolled in struct proc)
+AC_CACHE_VAL(ac_cv_solaris_fs_has_fs_rolled,
+[
+AC_TRY_COMPILE(
+[#include <sys/fs/ufs_fs.h>],
+[struct fs _fs;
+(void) _fs.fs_rolled;], 
+ac_cv_solaris_fs_has_fs_rolled=yes,
+ac_cv_solaris_fs_has_fs_rolled=no)])
+AC_MSG_RESULT($ac_cv_solaris_fs_has_fs_rolled)
+if test "$ac_cv_solaris_fs_has_fs_rolled" = "yes"; then
+  AC_DEFINE(STRUCT_FS_HAS_FS_ROLLED, 1, [define if struct fs has fs_rolled])
+fi
+])
+

diff --git a/src/vfsck/setup.c b/src/vfsck/setup.c
index a9afae9b6dc2851250aea44c83daea7645a89b21..a7f30c74dbabf4b39d29c52ddcea65c56a59a297 100644 (file)
--- a/src/vfsck/setup.c
+++ b/src/vfsck/setup.c
@@ -673,7 +673,11 @@ readsb(listerr)
                return (1);
        }
        altsblock.fs_link = sblock.fs_link;
+#ifdef STRUCT_FS_HAS_FS_ROLLED
+       altsblock.fs_rolled = sblock.fs_rolled;
+#else
        altsblock.fs_rlink = sblock.fs_rlink;
+#endif
        altsblock.fs_time = sblock.fs_time;
        altsblock.fs_cstotal = sblock.fs_cstotal;
        altsblock.fs_cgrotor = sblock.fs_cgrotor;