Changeset 3dd148d in mainline for uspace/lib/fs

Timestamp:

2013-07-29T15:15:49Z (12 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

736b07b

Parents:

a1c95da

Message:

Change stafs function operation to allow correct error handling.

Location:

uspace/lib/fs

Files:

• libfs.c (modified) (2 diffs)
• libfs.h (modified) (1 diff)

uspace/lib/fs/libfs.c

@@ -834 +834 @@
         
         ops->node_put(fn);
-        
+
+
         async_data_read_finalize(callid, &stat, sizeof(struct stat));
         async_answer_0(rid, EOK);
@@ -862 +863 @@
         memset(&statfs, 0, sizeof(struct statfs));
 
-        if (NULL != ops->size_block)    
-                statfs.f_bsize = ops->size_block(service_id);
-        if (NULL != ops->total_block_count)
-                statfs.f_blocks = ops->total_block_count(service_id);
-        if (NULL != ops->free_block_count)
-                statfs.f_bfree = ops->free_block_count(service_id);
-        
+        if (NULL != ops->size_block) {  
+                rc = ops->size_block(service_id, &statfs.f_bsize);
+                if (rc != EOK) goto error;
+        }
+
+        if (NULL != ops->total_block_count) {
+                rc = ops->total_block_count(service_id, &statfs.f_blocks);
+                if (rc != EOK) goto error;
+        }
+
+        if (NULL != ops->free_block_count) {
+                rc = ops->free_block_count(service_id, &statfs.f_bfree);
+                if (rc != EOK) goto error;
+        }
+
         ops->node_put(fn);
-        
         async_data_read_finalize(callid, &statfs, sizeof(struct statfs));
         async_answer_0(rid, EOK);
+        return;
+
+error:
+        ops->node_put(fn);
+        async_answer_0(callid, EINVAL);
+        async_answer_0(rid, EINVAL);
 }
 

uspace/lib/fs/libfs.h

@@ -93 +93 @@
         bool (* is_file)(fs_node_t *);
         service_id_t (* service_get)(fs_node_t *);
-        uint32_t (* size_block)(service_id_t);
-        uint64_t (* total_block_count)(service_id_t);
-        uint64_t (* free_block_count)(service_id_t);
+        int (* size_block)(service_id_t, uint32_t *);
+        int (* total_block_count)(service_id_t, uint64_t *);
+        int (* free_block_count)(service_id_t, uint64_t *);
 } libfs_ops_t;