Index: uspace/lib/libfs/libfs.c
===================================================================
--- uspace/lib/libfs/libfs.c	(revision a8e9ab8dd2fc2d06e904785bacded96f27319e6c)
+++ uspace/lib/libfs/libfs.c	(revision 8476a8dc6175cdfacf21d51244b0a2ff45d4cd8f)
@@ -135,12 +135,12 @@
  * @param request	VFS_LOOKUP request data itself.
  */
-void libfs_lookup(libfs_ops_t *ops, int fs_handle, ipc_callid_t rid,
+void libfs_lookup(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_callid_t rid,
     ipc_call_t *request)
 {
 	unsigned next = IPC_GET_ARG1(*request);
 	unsigned last = IPC_GET_ARG2(*request);
-	int dev_handle = IPC_GET_ARG3(*request);
+	dev_handle_t dev_handle = IPC_GET_ARG3(*request);
 	int lflag = IPC_GET_ARG4(*request);
-	int index = IPC_GET_ARG5(*request); /* when L_LINK specified */
+	fs_index_t index = IPC_GET_ARG5(*request); /* when L_LINK specified */
 
 	if (last < next)
Index: uspace/lib/libfs/libfs.h
===================================================================
--- uspace/lib/libfs/libfs.h	(revision a8e9ab8dd2fc2d06e904785bacded96f27319e6c)
+++ uspace/lib/libfs/libfs.h	(revision 8476a8dc6175cdfacf21d51244b0a2ff45d4cd8f)
@@ -44,11 +44,11 @@
 typedef struct {
 	bool (* match)(void *, void *, const char *);
-	void * (* node_get)(int, int, unsigned long);
+	void * (* node_get)(fs_handle_t, dev_handle_t, fs_index_t);
 	void * (* create)(int);
 	void (* destroy)(void *);
 	bool (* link)(void *, void *, const char *);
 	int (* unlink)(void *, void *);
-	unsigned long (* index_get)(void *);
-	unsigned long (* size_get)(void *);
+	fs_index_t (* index_get)(void *);
+	size_t (* size_get)(void *);
 	unsigned (* lnkcnt_get)(void *);
 	void *(* child_get)(void *);
@@ -75,5 +75,5 @@
 extern bool node_is_mp(int, unsigned long);
 
-extern void libfs_lookup(libfs_ops_t *, int, ipc_callid_t, ipc_call_t *);
+extern void libfs_lookup(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);
 
 #endif