Changeset 4f30222 in mainline for uspace/lib

Timestamp:

2017-05-16T21:58:20Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3ec2acc

Parents:

dde4689

Message:

VFS_OUT_MOUNTED does not need to return the link count

Location:

uspace/lib

Files:

• ext4/src/ops.c (modified) (3 diffs)
• fs/libfs.c (modified) (1 diff)
• fs/libfs.h (modified) (1 diff)

uspace/lib/ext4/src/ops.c

@@ -920 +920 @@
  * @param index      Output value - index of root node
  * @param size       Output value - size of root node
- * @param lnkcnt     Output value - link count of root node
  *
  * @return Error code
@@ -926 +925 @@
  */
 static int ext4_mounted(service_id_t service_id, const char *opts,
-    fs_index_t *index, aoff64_t *size, unsigned *lnkcnt)
+    fs_index_t *index, aoff64_t *size)
 {
         ext4_filesystem_t *fs;
@@ -962 +961 @@
         *index = EXT4_INODE_ROOT_INDEX;
         *size = rnsize;
-        *lnkcnt = 1;
         
         return EOK;

uspace/lib/fs/libfs.c

@@ -123 +123 @@
         fs_index_t index;
         aoff64_t size;
-        unsigned lnkcnt;
-        rc = vfs_out_ops->mounted(service_id, opts, &index, &size, &lnkcnt);
+        rc = vfs_out_ops->mounted(service_id, opts, &index, &size);
 
         if (rc == EOK)
-                async_answer_4(rid, EOK, index, LOWER32(size), UPPER32(size),
-                    lnkcnt);
+                async_answer_3(rid, EOK, index, LOWER32(size), UPPER32(size));
         else
                 async_answer_0(rid, rc);

uspace/lib/fs/libfs.h

@@ -44 +44 @@
 typedef struct {
         int (* fsprobe)(service_id_t, vfs_fs_probe_info_t *);
-        int (* mounted)(service_id_t, const char *, fs_index_t *, aoff64_t *,
-            unsigned *);
+        int (* mounted)(service_id_t, const char *, fs_index_t *, aoff64_t *);
         int (* unmounted)(service_id_t);
         int (* read)(service_id_t, fs_index_t, aoff64_t, size_t *);