Index: uspace/srv/fs/cdfs/cdfs_ops.c
===================================================================
--- uspace/srv/fs/cdfs/cdfs_ops.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/srv/fs/cdfs/cdfs_ops.c	(revision eed4139909f4e93017245a6736941de6564db9fe)
@@ -1271,8 +1271,8 @@
 	}
 
-	cap_call_handle_t callid;
+	cap_call_handle_t chandle;
 	size_t len;
-	if (!async_data_read_receive(&callid, &len)) {
-		async_answer_0(callid, EINVAL);
+	if (!async_data_read_receive(&chandle, &len)) {
+		async_answer_0(chandle, EINVAL);
 		return EINVAL;
 	}
@@ -1281,5 +1281,5 @@
 		if (pos >= node->size) {
 			*rbytes = 0;
-			async_data_read_finalize(callid, NULL, 0);
+			async_data_read_finalize(chandle, NULL, 0);
 		} else {
 			cdfs_lba_t lba = pos / BLOCK_SIZE;
@@ -1293,9 +1293,9 @@
 			    BLOCK_FLAGS_NONE);
 			if (rc != EOK) {
-				async_answer_0(callid, rc);
+				async_answer_0(chandle, rc);
 				return rc;
 			}
 
-			async_data_read_finalize(callid, block->data + offset,
+			async_data_read_finalize(chandle, block->data + offset,
 			    *rbytes);
 			rc = block_put(block);
@@ -1306,5 +1306,5 @@
 		link_t *link = list_nth(&node->cs_list, pos);
 		if (link == NULL) {
-			async_answer_0(callid, ENOENT);
+			async_answer_0(chandle, ENOENT);
 			return ENOENT;
 		}
@@ -1314,5 +1314,5 @@
 
 		*rbytes = 1;
-		async_data_read_finalize(callid, dentry->name,
+		async_data_read_finalize(chandle, dentry->name,
 		    str_size(dentry->name) + 1);
 	}