Index: uspace/srv/bd/ata_bd/ata_bd.c
===================================================================
--- uspace/srv/bd/ata_bd/ata_bd.c	(revision 953769ff5f13f913fbf03e6f1b8aac2f414094f6)
+++ uspace/srv/bd/ata_bd/ata_bd.c	(revision fbbbb8aad83e159be5cdecf2d81e66df39150468)
@@ -73,5 +73,5 @@
 static int ata_bd_init(void);
 static void ata_bd_connection(ipc_callid_t iid, ipc_call_t *icall);
-static int ata_bd_rdwr(int disk_id, ipcarg_t method, off_t offset, off_t size,
+static int ata_bd_rdwr(int disk_id, ipcarg_t method, off_t offset, size_t size,
     void *buf);
 static int ata_bd_read_block(int disk_id, uint64_t blk_idx, size_t blk_cnt,
@@ -147,5 +147,5 @@
 	uint16_t data;
 	uint8_t status;
-	int i;
+	size_t i;
 
 	printf("Identify drive %d\n", disk_id);
@@ -235,5 +235,5 @@
 	int retval;
 	off_t idx;
-	off_t size;
+	size_t size;
 	int disk_id, i;
 
@@ -295,12 +295,12 @@
 }
 
-static int ata_bd_rdwr(int disk_id, ipcarg_t method, off_t blk_idx, off_t size,
+static int ata_bd_rdwr(int disk_id, ipcarg_t method, off_t blk_idx, size_t size,
     void *buf)
 {
 	int rc;
-	off_t now;
+	size_t now;
 
 	while (size > 0) {
-		now = size < block_size ? size : (off_t) block_size;
+		now = size < block_size ? size : block_size;
 		if (now != block_size)
 			return EINVAL;
Index: uspace/srv/bd/file_bd/file_bd.c
===================================================================
--- uspace/srv/bd/file_bd/file_bd.c	(revision 953769ff5f13f913fbf03e6f1b8aac2f414094f6)
+++ uspace/srv/bd/file_bd/file_bd.c	(revision fbbbb8aad83e159be5cdecf2d81e66df39150468)
@@ -61,6 +61,6 @@
 static int file_bd_init(const char *fname);
 static void file_bd_connection(ipc_callid_t iid, ipc_call_t *icall);
-static int file_bd_read(off_t blk_idx, off_t size, void *buf);
-static int file_bd_write(off_t blk_idx, off_t size, void *buf);
+static int file_bd_read(off_t blk_idx, size_t size, void *buf);
+static int file_bd_write(off_t blk_idx, size_t size, void *buf);
 
 int main(int argc, char **argv)
@@ -119,5 +119,5 @@
 	int retval;
 	off_t idx;
-	off_t size;
+	size_t size;
 
 	/* Answer the IPC_M_CONNECT_ME_TO call. */
@@ -166,5 +166,5 @@
 }
 
-static int file_bd_read(off_t blk_idx, off_t size, void *buf)
+static int file_bd_read(off_t blk_idx, size_t size, void *buf)
 {
 	size_t n_rd;
@@ -194,5 +194,5 @@
 }
 
-static int file_bd_write(off_t blk_idx, off_t size, void *buf)
+static int file_bd_write(off_t blk_idx, size_t size, void *buf)
 {
 	size_t n_wr;
Index: uspace/srv/bd/gxe_bd/gxe_bd.c
===================================================================
--- uspace/srv/bd/gxe_bd/gxe_bd.c	(revision 953769ff5f13f913fbf03e6f1b8aac2f414094f6)
+++ uspace/srv/bd/gxe_bd/gxe_bd.c	(revision fbbbb8aad83e159be5cdecf2d81e66df39150468)
@@ -96,5 +96,5 @@
 static int gxe_bd_init(void);
 static void gxe_bd_connection(ipc_callid_t iid, ipc_call_t *icall);
-static int gx_bd_rdwr(int disk_id, ipcarg_t method, off_t offset, off_t size,
+static int gx_bd_rdwr(int disk_id, ipcarg_t method, off_t offset, size_t size,
     void *buf);
 static int gxe_bd_read_block(int disk_id, uint64_t offset, size_t size,
@@ -161,5 +161,5 @@
 	int retval;
 	off_t idx;
-	off_t size;
+	size_t size;
 	int disk_id, i;
 
@@ -221,5 +221,5 @@
 }
 
-static int gx_bd_rdwr(int disk_id, ipcarg_t method, off_t offset, off_t size,
+static int gx_bd_rdwr(int disk_id, ipcarg_t method, off_t offset, size_t size,
     void *buf)
 {
