Changeset b79d450 in mainline for uspace/lib/libfs

Timestamp:

2010-01-27T20:35:49Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fb6f1a5

Parents:

fccc236 (diff), 95e6c4f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

uspace/lib/libfs

Files:

• Makefile (modified) (1 diff)
• Makefile.build (deleted)
• libfs.c (modified) (3 diffs)
• libfs.h (modified) (1 diff)

uspace/lib/libfs/Makefile

@@ -28 +28 @@
 #
 
-include Makefile.common
+USPACE_PREFIX = ../..
+LIBS = $(LIBC_PREFIX)/libc.a
 
-.PHONY: all clean
+OUTPUT = libfs.a
 
-all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBC_PREFIX)/libc.a
-        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
-        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
+SOURCES = \
+        libfs.c
 
-clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(LIBFS)
-        find . -name '*.o' -follow -exec rm \{\} \;
+include ../Makefile.common

uspace/lib/libfs/libfs.c

@@ -224 +224 @@
         ipc_answer_3(rid, rc, IPC_GET_ARG1(answer), IPC_GET_ARG2(answer),
             IPC_GET_ARG3(answer));
+}
+
+void libfs_unmount(libfs_ops_t *ops, ipc_callid_t rid, ipc_call_t *request)
+{
+        dev_handle_t mp_dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+        fs_index_t mp_fs_index = (fs_index_t) IPC_GET_ARG2(*request);
+        fs_node_t *fn;
+        int res;
+
+        res = ops->node_get(&fn, mp_dev_handle, mp_fs_index);
+        if ((res != EOK) || (!fn)) {
+                ipc_answer_0(rid, combine_rc(res, ENOENT));
+                return;
+        }
+
+        /*
+         * We are clearly expecting to find the mount point active.
+         */
+        if (!fn->mp_data.mp_active) {
+                (void) ops->node_put(fn);
+                ipc_answer_0(rid, EINVAL);
+                return;
+        }
+
+        /*
+         * Tell the mounted file system to unmount.
+         */
+        res = async_req_1_0(fn->mp_data.phone, VFS_OUT_UNMOUNTED,
+            fn->mp_data.dev_handle);
+
+        /*
+         * If everything went well, perform the clean-up on our side.
+         */
+        if (res == EOK) {
+                ipc_hangup(fn->mp_data.phone);
+                fn->mp_data.mp_active = false;
+                fn->mp_data.fs_handle = 0;
+                fn->mp_data.dev_handle = 0;
+                fn->mp_data.phone = 0;
+                /* Drop the reference created in libfs_mount(). */
+                (void) ops->node_put(fn);
+        }
+
+        (void) ops->node_put(fn);
+        ipc_answer_0(rid, res);
 }
 
@@ -304 +349 @@
                 on_error(rc, goto out_with_answer);
                 
-                if ((tmp) && (tmp->mp_data.mp_active)) {
+                /*
+                 * If the matching component is a mount point, there are two
+                 * legitimate semantics of the lookup operation. The first is
+                 * the commonly used one in which the lookup crosses each mount
+                 * point into the mounted file system. The second semantics is
+                 * used mostly during unmount() and differs from the first one
+                 * only in that the last mount point in the looked up path,
+                 * which is also its last component, is not crossed.
+                 */
+
+                if ((tmp) && (tmp->mp_data.mp_active) &&
+                    (!(lflag & L_MP) || (next <= last))) {
                         if (next > last)
                                 next = last = first;
@@ -475 +531 @@
                 goto out;
         }
+
+        if ((lflag & L_ROOT) && par) {
+                ipc_answer_0(rid, EINVAL);
+                goto out;
+        }
         
 out_with_answer:

uspace/lib/libfs/libfs.h

@@ -95 +95 @@
 
 extern void libfs_mount(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);
+extern void libfs_unmount(libfs_ops_t *, ipc_callid_t, ipc_call_t *);
 extern void libfs_lookup(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);
 extern void libfs_stat(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);