Changes in uspace/srv/bd/file_bd/file_bd.c [ed903174:0da4e41] in mainline

File:

• uspace/srv/bd/file_bd/file_bd.c (modified) (8 diffs)

uspace/srv/bd/file_bd/file_bd.c

@@ -45 +45 @@
 #include <async.h>
 #include <as.h>
-#include <fibril_synch.h>
+#include <fibril_sync.h>
 #include <devmap.h>
 #include <sys/types.h>
-#include <sys/typefmt.h>
 #include <errno.h>
 #include <bool.h>
@@ -57 +56 @@
 
 static const size_t block_size = 512;
-static aoff64_t num_blocks;
 static FILE *img;
 
@@ -101 +99 @@
 {
         int rc;
-        long img_size;
 
         rc = devmap_driver_register(NAME, file_bd_connection);
@@ -112 +109 @@
         if (img == NULL)
                 return EINVAL;
-
-        if (fseek(img, 0, SEEK_END) != 0) {
-                fclose(img);
-                return EIO;
-        }
-
-        img_size = ftell(img);
-        if (img_size < 0) {
-                fclose(img);
-                return EIO;
-        }
-
-        num_blocks = img_size / block_size;
 
         fibril_mutex_initialize(&dev_lock);
@@ -190 +174 @@
                         ipc_answer_1(callid, EOK, block_size);
                         continue;
-                case BD_GET_NUM_BLOCKS:
-                        ipc_answer_2(callid, EOK, LOWER32(num_blocks),
-                            UPPER32(num_blocks));
-                        continue;
                 default:
                         retval = EINVAL;
@@ -206 +186 @@
 {
         size_t n_rd;
-        int rc;
-
-        /* Check whether access is within device address bounds. */
-        if (ba + cnt > num_blocks) {
-                printf(NAME ": Accessed blocks %" PRIuOFF64 "-%" PRIuOFF64 ", while "
-                    "max block number is %" PRIuOFF64 ".\n", ba, ba + cnt - 1,
-                    num_blocks - 1);
-                return ELIMIT;
-        }
 
         fibril_mutex_lock(&dev_lock);
 
-        clearerr(img);
-        rc = fseek(img, ba * block_size, SEEK_SET);
-        if (rc < 0) {
-                fibril_mutex_unlock(&dev_lock);
-                return EIO;
-        }
-
+        fseek(img, ba * block_size, SEEK_SET);
         n_rd = fread(buf, block_size, cnt, img);
 
@@ -244 +209 @@
 {
         size_t n_wr;
-        int rc;
-
-        /* Check whether access is within device address bounds. */
-        if (ba + cnt > num_blocks) {
-                printf(NAME ": Accessed blocks %" PRIuOFF64 "-%" PRIuOFF64 ", while "
-                    "max block number is %" PRIuOFF64 ".\n", ba, ba + cnt - 1,
-                    num_blocks - 1);
-                return ELIMIT;
-        }
 
         fibril_mutex_lock(&dev_lock);
 
-        clearerr(img);
-        rc = fseek(img, ba * block_size, SEEK_SET);
-        if (rc < 0) {
-                fibril_mutex_unlock(&dev_lock);
-                return EIO;
-        }
-
-        n_wr = fwrite(buf, block_size, cnt, img);
+        fseek(img, ba * block_size, SEEK_SET);
+        n_wr = fread(buf, block_size, cnt, img);
 
         if (ferror(img) || n_wr < cnt) {
@@ -270 +220 @@
         }
 
-        if (fflush(img) != 0) {
-                fibril_mutex_unlock(&dev_lock);
-                return EIO;
-        }
-
         fibril_mutex_unlock(&dev_lock);