Changeset 97bc3ee in mainline for uspace/srv/fs/fat/fat_ops.c

Timestamp:

2011-04-09T19:23:12Z (14 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d260a95

Parents:

fc35e98

Message:

Full support for FAT12 file system. Correct creating directories and files. Fixing addressing issue.
Type of FAT (12,16,32) is determined only on the basis of the count of clusters(according to Microsoft FAT specification). I.e. FAT
with 4085 clusters or less will be determined as FAT12. FAT16 must contain more than 4085 clusters but less then 65525.

File:

• uspace/srv/fs/fat/fat_ops.c (modified) (33 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -29 +29 @@
 /** @addtogroup fs
  * @{
- */ 
+ */
 
 /**
@@ -116 +116 @@
         fat_dentry_t *d;
         int rc;
-        
+
         assert(node->dirty);
 
         bs = block_bb_get(node->idx->devmap_handle);
-        
+
         /* Read the block that contains the dentry of interest. */
         rc = _fat_block_get(&b, bs, node->idx->devmap_handle, node->idx->pfc,
@@ -136 +136 @@
                 d->attr = FAT_ATTR_SUBDIR;
         }
-        
+
         /* TODO: update other fields? (e.g time fields) */
-        
+
         b->dirty = true;                /* need to sync block */
         rc = block_put(b);
@@ -255 +255 @@
         fn->data = nodep;
         nodep->bp = fn;
-        
+
         *nodepp = nodep;
         return EOK;
@@ -291 +291 @@
          * We must instantiate the node from the file system.
          */
-        
+
         assert(idxp->pfc);
 
@@ -310 +310 @@
         d = ((fat_dentry_t *)b->data) + (idxp->pdi % DPS(bs));
         if (d->attr & FAT_ATTR_SUBDIR) {
-                /* 
+                /*
                  * The only directory which does not have this bit set is the
                  * root directory itself. The root directory node is handled
@@ -316 +316 @@
                  */
                 nodep->type = FAT_DIRECTORY;
-                /*
+
+                /*
                  * Unfortunately, the 'size' field of the FAT dentry is not
                  * defined for the directory entry type. We must determine the
@@ -334 +335 @@
                 nodep->size = uint32_t_le2host(d->size);
         }
-        nodep->firstc = uint16_t_le2host(d->firstc);
+
+        nodep->firstc = uint16_t_le2host(d->firstc);
         nodep->lnkcnt = 1;
         nodep->refcnt = 1;
@@ -383 +385 @@
                 if (rc != EOK)
                         return rc;
-                for (j = 0; j < DPS(bs); j++) { 
+                for (j = 0; j < DPS(bs); j++) {
                         d = ((fat_dentry_t *)b->data) + j;
                         switch (fat_classify_dentry(d)) {
@@ -521 +523 @@
         rc = fat_idx_get_new(&idxp, devmap_handle);
         if (rc != EOK) {
-                (void) fat_free_clusters(bs, devmap_handle, mcl);       
+                (void) fat_free_clusters(bs, devmap_handle, mcl);
                 (void) fat_node_put(FS_NODE(nodep));
                 return rc;
@@ -618 +620 @@
          * a new one.
          */
-        
+
         fibril_mutex_lock(&parentp->idx->lock);
         bs = block_bb_get(parentp->idx->devmap_handle);
@@ -650 +652 @@
         }
         j = 0;
-        
+
         /*
          * We need to grow the parent in order to create a new unused dentry.
@@ -697 +699 @@
         rc = block_put(b);
         fibril_mutex_unlock(&parentp->idx->lock);
-        if (rc != EOK) 
+        if (rc != EOK)
                 return rc;
 
         fibril_mutex_lock(&childp->idx->lock);
-        
+
         if (childp->type == FAT_DIRECTORY) {
                 /*
@@ -778 +780 @@
         if (!parentp)
                 return EBUSY;
-        
+
         rc = fat_has_children(&has_children, cfn);
         if (rc != EOK)
@@ -794 +796 @@
             NULL, (childp->idx->pdi * sizeof(fat_dentry_t)) / BPS(bs),
             BLOCK_FLAGS_NONE);
-        if (rc != EOK) 
+        if (rc != EOK)
                 goto error;
         d = (fat_dentry_t *)b->data +
@@ -839 +841 @@
                 return EOK;
         }
-        
+
         fibril_mutex_lock(&nodep->idx->lock);
         bs = block_bb_get(nodep->idx->devmap_handle);
@@ -847 +849 @@
         for (i = 0; i < blocks; i++) {
                 fat_dentry_t *d;
-        
+
                 rc = fat_block_get(&b, bs, nodep, i, BLOCK_FLAGS_NONE);
                 if (rc != EOK) {
@@ -875 +877 @@
                 if (rc != EOK) {
                         fibril_mutex_unlock(&nodep->idx->lock);
-                        return rc;      
+                        return rc;
                 }
         }
@@ -945 +947 @@
  */
 
-
-#define RootDirSectors(bs)      (((RDE(bs)*32) + (BPS(bs)-1)) / BPS(bs))
-#define FATSz(bs)               SF(bs) != 0 ? SF(bs) : uint32_t_le2host((bs)->fat32.sectors_per_fat)
-#define DataSec(bs)             (TS(bs) - (RSCNT(bs) + (FATCNT(bs) * FATSz(bs)) + RootDirSectors(bs)))
-#define CountOfClusters(bs)     (DataSec(bs) / SPC(bs))
-
 void fat_mounted(ipc_callid_t rid, ipc_call_t *request)
 {
@@ -956 +952 @@
         enum cache_mode cmode;
         fat_bs_t *bs;
-        
+
         /* Accept the mount options */
         char *opts;
         int rc = async_data_write_accept((void **) &opts, true, 0, 0, 0, NULL);
-        
+
         if (rc != EOK) {
                 async_answer_0(rid, rc);
@@ -991 +987 @@
         /* get the buffer with the boot sector */
         bs = block_bb_get(devmap_handle);
-        
+
         if (BPS(bs) != BS_SIZE) {
                 block_fini(devmap_handle);
@@ -1007 +1003 @@
 
         /* Storing FAT type (12, 16, 32) in reserved field (bs->reserved) */
-        if (CountOfClusters(bs) < 4085) {
+        if (CC(bs) < 4085) {
         /* Volume is FAT12 */
             printf("Found FAT12 filesystem\n");
             (bs)->reserved = 12;
-        } else if (CountOfClusters(bs) < 65525) {
+        } else if (CC(bs) < 65525) {
         /* Volume is FAT16 */
             printf("Found FAT16 filesystem\n");
@@ -1017 +1013 @@
         } else {
         /* Volume is FAT32 */
-            printf("FAT32 is not supported by FAT driver. Sorry\n");
+            printf("FAT32 filesystem is not supported by FAT server. Sorry.\n");
             block_fini(devmap_handle);
             async_answer_0(rid, ENOTSUP);
@@ -1085 +1081 @@
         rootp->bp = rfn;
         rfn->data = rootp;
-        
+
         fibril_mutex_unlock(&ridxp->lock);
 
@@ -1119 +1115 @@
                 return;
         }
-        
+
         /*
          * Put the root node and force it to the FAT free node list.
@@ -1300 +1296 @@
         int flags = BLOCK_FLAGS_NONE;
         int rc;
-        
+
         rc = fat_node_get(&fn, devmap_handle, index);
         if (rc != EOK) {
@@ -1311 +1307 @@
         }
         nodep = FAT_NODE(fn);
-        
+
         ipc_callid_t callid;
         size_t len;
@@ -1328 +1324 @@
          * but this one greatly simplifies fat_write(). Note that we can afford
          * to do this because the client must be ready to handle the return
-         * value signalizing a smaller number of bytes written. 
-         */ 
+         * value signalizing a smaller number of bytes written.
+         */
         bytes = min(len, BPS(bs) - pos % BPS(bs));
         if (bytes == BPS(bs))
                 flags |= BLOCK_FLAGS_NOREAD;
-        
+
         boundary = ROUND_UP(nodep->size, BPC(bs));
         if (pos < boundary) {
@@ -1379 +1375 @@
                  */
                 unsigned nclsts;
-                fat_cluster_t mcl, lcl; 
- 
+                fat_cluster_t mcl, lcl;
+
                 nclsts = (ROUND_UP(pos + bytes, BPC(bs)) - boundary) / BPC(bs);
                 /* create an independent chain of nclsts clusters in all FATs */
@@ -1476 +1472 @@
                 nodep->size = size;
                 nodep->dirty = true;            /* need to sync node */
-                rc = EOK;       
+                rc = EOK;
         } else {
                 /*
@@ -1497 +1493 @@
                 nodep->size = size;
                 nodep->dirty = true;            /* need to sync node */
-                rc = EOK;       
+                rc = EOK;
         }
 out:
@@ -1553 +1549 @@
         devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
         fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
-        
+
         fs_node_t *fn;
         int rc = fat_node_get(&fn, devmap_handle, index);
@@ -1564 +1560 @@
                 return;
         }
-        
+
         fat_node_t *nodep = FAT_NODE(fn);
-        
+
         nodep->dirty = true;
         rc = fat_node_sync(nodep);
-        
+
         fat_node_put(fn);
         async_answer_0(rid, rc);