summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-12-07 06:06:52 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-12-07 06:06:52 +0000
commit8c1eedaf0c5c8e734d4d4d6ccd80796dfb0eac86 (patch)
tree12e370ff34983739bb7ce50e4a8b1652db3d141e /sys
parent3d21f03eefe685571285670b7c7b70adb2c5691b (diff)
backout missed by tedu:
prev softdep merge could lead to inode wait deadlock for unknown reasons. revert.
Diffstat (limited to 'sys')
-rw-r--r--sys/ufs/ffs/ffs_softdep_stub.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/ufs/ffs/ffs_softdep_stub.c b/sys/ufs/ffs/ffs_softdep_stub.c
index cc86c310f42..6b6b4f57d1b 100644
--- a/sys/ufs/ffs/ffs_softdep_stub.c
+++ b/sys/ufs/ffs/ffs_softdep_stub.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_softdep_stub.c,v 1.7 2004/07/13 21:04:29 millert Exp $ */
+/* $OpenBSD: ffs_softdep_stub.c,v 1.8 2004/12/07 06:06:51 deraadt Exp $ */
/*
* Copyright 1998 Marshall Kirk McKusick. All Rights Reserved.
@@ -154,18 +154,16 @@ softdep_freefile(pvp, ino, mode)
panic("softdep_freefile called");
}
-int
-softdep_setup_directory_add(bp, dp, diroffset, newinum, newdirbp, isnewblk)
+void
+softdep_setup_directory_add(bp, dp, diroffset, newinum, newdirbp)
struct buf *bp;
struct inode *dp;
off_t diroffset;
long newinum;
struct buf *newdirbp;
- int isnewblk;
{
panic("softdep_setup_directory_add called");
- return (0);
}
void