diff --git a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
index 9219c81f7f..540ac9268e 100644
--- a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
@@ -722,7 +722,7 @@ bfs_ioctl(fs_volume* _volume, fs_vnode* _node, void* _cookie, uint32 cmd,
 		}
 #endif
 	}
-	return B_BAD_VALUE;
+	return B_DEV_INVALID_IOCTL;
 }
 
 
diff --git a/src/add-ons/kernel/file_systems/btrfs/kernel_interface.cpp b/src/add-ons/kernel/file_systems/btrfs/kernel_interface.cpp
index 7bcf903bf8..5c6905b5f5 100644
--- a/src/add-ons/kernel/file_systems/btrfs/kernel_interface.cpp
+++ b/src/add-ons/kernel/file_systems/btrfs/kernel_interface.cpp
@@ -365,7 +365,7 @@ btrfs_ioctl(fs_volume* _volume, fs_vnode* _node, void* _cookie, uint32 cmd,
 	TRACE("ioctl: %lu\n", cmd);
 
 	/*Volume* volume = (Volume*)_volume->private_volume;*/
-	return B_OK;
+	return B_DEV_INVALID_IOCTL;
 }
 
 
diff --git a/src/add-ons/kernel/file_systems/exfat/kernel_interface.cpp b/src/add-ons/kernel/file_systems/exfat/kernel_interface.cpp
index 496f989f15..2d0a6b2b6b 100644
--- a/src/add-ons/kernel/file_systems/exfat/kernel_interface.cpp
+++ b/src/add-ons/kernel/file_systems/exfat/kernel_interface.cpp
@@ -370,7 +370,7 @@ exfat_ioctl(fs_volume* _volume, fs_vnode* _node, void* _cookie, uint32 cmd,
 	TRACE("ioctl: %lu\n", cmd);
 
 	/*Volume* volume = (Volume*)_volume->private_volume;*/
-	return B_OK;
+	return B_DEV_INVALID_IOCTL;
 }
 
 
diff --git a/src/add-ons/kernel/file_systems/ext2/kernel_interface.cpp b/src/add-ons/kernel/file_systems/ext2/kernel_interface.cpp
index 0f1973e734..373d83edcc 100644
--- a/src/add-ons/kernel/file_systems/ext2/kernel_interface.cpp
+++ b/src/add-ons/kernel/file_systems/ext2/kernel_interface.cpp
@@ -565,7 +565,7 @@ ext2_ioctl(fs_volume* _volume, fs_vnode* _node, void* _cookie, uint32 cmd,
 		}
 	}
 
-	return B_OK;
+	return B_DEV_INVALID_IOCTL;
 }
 
 
diff --git a/src/add-ons/kernel/file_systems/fat/dosfs.c b/src/add-ons/kernel/file_systems/fat/dosfs.c
index 0db33eeed3..f088e3a32a 100644
--- a/src/add-ons/kernel/file_systems/fat/dosfs.c
+++ b/src/add-ons/kernel/file_systems/fat/dosfs.c
@@ -1220,7 +1220,7 @@ dosfs_ioctl(fs_volume *_vol, fs_vnode *_node, void *cookie, uint32 code,
 		default :
 			DPRINTF(0, ("dosfs_ioctl: vol %lx, vnode %Lx code = %ld\n",
 				vol->id, node->vnid, code));
-			result = EINVAL;
+			result = B_DEV_INVALID_IOCTL;
 			break;
 	}
 
diff --git a/src/add-ons/kernel/file_systems/netfs/client/Volume.cpp b/src/add-ons/kernel/file_systems/netfs/client/Volume.cpp
index d0f635b18e..c34349943c 100644
--- a/src/add-ons/kernel/file_systems/netfs/client/Volume.cpp
+++ b/src/add-ons/kernel/file_systems/netfs/client/Volume.cpp
@@ -328,7 +328,7 @@ status_t
 Volume::IOCtl(Node* node, void* cookie, int cmd, void* buffer,
 	size_t bufferSize)
 {
-	return B_BAD_VALUE;
+	return B_DEV_INVALID_IOCTL;
 }
 
 // SetFlags
diff --git a/src/add-ons/kernel/file_systems/ramfs/kernel_interface.cpp b/src/add-ons/kernel/file_systems/ramfs/kernel_interface.cpp
index 12070b3e02..3a539d8ab1 100644
--- a/src/add-ons/kernel/file_systems/ramfs/kernel_interface.cpp
+++ b/src/add-ons/kernel/file_systems/ramfs/kernel_interface.cpp
@@ -318,7 +318,7 @@ PRINT(("  RAMFS_IOCTL_DUMP_INDEX, `%s'\n", name));
 			break;
 		}
 		default:
-			error = B_BAD_VALUE;
+			error = B_DEV_INVALID_IOCTL;
 			break;
 	}
 	RETURN_ERROR(error);