diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 2d9458852..5853512be 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,5 +1,8 @@
 2003-10-11  Pavel Roskin  <proski@gnu.org>
 
+	* cpio.c (init_cpiofs): Set vfs_cpiofs_ops.setctl to NULL, or
+	bad things happen after unsuccessful deletion.
+
 	* vfs.h: Remove obsolete code.
 
 2003-10-10  Pavel Roskin  <proski@gnu.org>
diff --git a/vfs/cpio.c b/vfs/cpio.c
index 7a602d1e1..d52ea348e 100644
--- a/vfs/cpio.c
+++ b/vfs/cpio.c
@@ -631,6 +631,7 @@ init_cpiofs (void)
     vfs_cpiofs_ops.data = &cpiofs_data;
     vfs_cpiofs_ops.read = cpio_read;
     vfs_cpiofs_ops.write = NULL;
+    vfs_cpiofs_ops.setctl = NULL;
     vfs_cpiofs_ops.ungetlocalcopy = cpio_ungetlocalcopy;
     vfs_register_class (&vfs_cpiofs_ops);
 }