Changeset 51db5aeb in mainline

Timestamp:

2011-07-17T12:15:17Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1dd3e81

Parents:

44799a0

Message:

Add the unmount and sync functions, do not destroy a node if its number of hard links is > 0

Location:

uspace/srv/fs/minixfs

Files:

• mfs.c (modified) (1 diff)
• mfs.h (modified) (1 diff)
• mfs_ops.c (modified) (4 diffs)

uspace/srv/fs/minixfs/mfs.c

@@ -127 +127 @@
                         mfs_destroy(callid, &call);
                         break;
+                case VFS_OUT_UNMOUNTED:
+                        mfs_unmounted(callid, &call);
+                        break;
+                case VFS_OUT_UNMOUNT:
+                        mfs_unmount(callid, &call);
+                        break;
+                case VFS_OUT_SYNC:
+                        mfs_sync(callid, &call);
+                        break;
                 default:
                         async_answer_0(callid, ENOTSUP);

uspace/srv/fs/minixfs/mfs.h

@@ -177 +177 @@
 mfs_destroy(ipc_callid_t rid, ipc_call_t *request);
 
+extern void
+mfs_unmounted(ipc_callid_t rid, ipc_call_t *request);
+
+extern void
+mfs_unmount(ipc_callid_t rid, ipc_call_t *request);
+
+extern void
+mfs_sync(ipc_callid_t rid, ipc_call_t *request);
+
 /*mfs_inode.c*/
 extern int

uspace/srv/fs/minixfs/mfs_ops.c

@@ -250 +250 @@
 }
 
+void mfs_unmount(ipc_callid_t rid, ipc_call_t *request)
+{
+        libfs_unmount(&mfs_libfs_ops, rid, request);
+}
+
+void mfs_unmounted(ipc_callid_t rid, ipc_call_t *request)
+{
+        devmap_handle_t devmap = (devmap_handle_t) IPC_GET_ARG1(*request);
+
+        (void) block_cache_fini(devmap);
+        block_fini(devmap);
+
+        async_answer_0(rid, EOK);
+}
+
 devmap_handle_t mfs_device_get(fs_node_t *fsnode)
 {
@@ -826 +841 @@
         assert(!has_children);
 
+        if (mnode->ino_i->i_nlinks > 0) {
+                mfsdebug("nlinks = %d", mnode->ino_i->i_nlinks);
+                r = EOK;
+                goto out;
+        }
+
         /*Free the entire inode content*/
         r = inode_shrink(mnode, mnode->ino_i->i_size);
@@ -832 +853 @@
         on_error(r, return r);
 
+out:
         free(mnode->ino_i);
         free(mnode);
@@ -935 +957 @@
 }
 
+void
+mfs_sync(ipc_callid_t rid, ipc_call_t *request)
+{
+        devmap_handle_t devmap = (devmap_handle_t) IPC_GET_ARG1(*request);
+        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
+
+        fs_node_t *fn;
+        int rc = mfs_node_get(&fn, devmap, index);
+        if (rc != EOK) {
+                async_answer_0(rid, rc);
+                return;
+        }
+        if (!fn) {
+                async_answer_0(rid, ENOENT);
+                return;
+        }
+
+        struct mfs_node *mnode = fn->data;
+        mnode->ino_i->dirty = true;
+
+        rc = mfs_node_put(fn);
+        async_answer_0(rid, rc);
+}
+
 /**
  * @}