diff --git a/headers/private/kernel/fs/node_monitor.h b/headers/private/kernel/fs/node_monitor.h
index eac260d857..248acc07b6 100644
--- a/headers/private/kernel/fs/node_monitor.h
+++ b/headers/private/kernel/fs/node_monitor.h
@@ -17,9 +17,9 @@ struct io_context;
 
 class NotificationListener;
 
-extern status_t remove_node_listener(dev_t device, dev_t node,
+extern status_t remove_node_listener(dev_t device, ino_t node,
 	NotificationListener& listener);
-extern status_t add_node_listener(dev_t device, dev_t node, uint32 flags,
+extern status_t add_node_listener(dev_t device, ino_t node, uint32 flags,
 	NotificationListener& listener);
 
 extern "C" {
diff --git a/src/system/kernel/fs/node_monitor.cpp b/src/system/kernel/fs/node_monitor.cpp
index a9aa4201ff..b8e648b428 100644
--- a/src/system/kernel/fs/node_monitor.cpp
+++ b/src/system/kernel/fs/node_monitor.cpp
@@ -264,7 +264,7 @@ NodeMonitorService::_RemoveListener(monitor_listener *listener)
 {
 	node_monitor *monitor = listener->monitor;
 
-	// remove it from the listener and I/O context lists	
+	// remove it from the listener and I/O context lists
 	monitor->listeners.Remove(listener);
 	list_remove_link(listener);
 
@@ -317,7 +317,7 @@ NodeMonitorService::_GetMonitor(io_context *context, dev_t device, ino_t node,
 	if (monitor == NULL)
 		return B_NO_MEMORY;
 
-	// initialize monitor		
+	// initialize monitor
 	monitor->device = device;
 	monitor->node = node;
 
@@ -477,7 +477,7 @@ NodeMonitorService::_GetInterestedMonitorListeners(dev_t device, ino_t node,
 	\param message The message to be sent.
 	\param interestedListeners An array of listener lists.
 	\param interestedListenerCount The number of elements in the
-		   \a interestedListeners array. 
+		   \a interestedListeners array.
 	\return
 	- \c B_OK, if everything went fine,
 	- another error code otherwise.
@@ -950,7 +950,7 @@ notify_mount(dev_t device, dev_t parentDevice, ino_t parentDirectory)
 
 
 status_t
-remove_node_listener(dev_t device, dev_t node, NotificationListener& listener)
+remove_node_listener(dev_t device, ino_t node, NotificationListener& listener)
 {
 	return sNodeMonitorService.RemoveListener(get_current_io_context(true),
 		device, node, listener);
@@ -958,7 +958,7 @@ remove_node_listener(dev_t device, dev_t node, NotificationListener& listener)
 
 
 status_t
-add_node_listener(dev_t device, dev_t node, uint32 flags,
+add_node_listener(dev_t device, ino_t node, uint32 flags,
 	NotificationListener& listener)
 {
 	return sNodeMonitorService.AddListener(get_current_io_context(true),