Changeset 00aece0 in mainline for uspace/srv/fs/locfs/locfs_ops.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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.

File:

• uspace/srv/fs/locfs/locfs_ops.c (modified) (4 diffs)

uspace/srv/fs/locfs/locfs_ops.c

@@ -418 +418 @@
 }
 
-static service_id_t locfs_device_get(fs_node_t *fn)
+static service_id_t locfs_service_get(fs_node_t *fn)
 {
         locfs_node_t *node = (locfs_node_t *) fn->data;
@@ -445 +445 @@
         .is_directory = locfs_is_directory,
         .is_file = locfs_is_file,
-        .device_get = locfs_device_get
+        .service_get = locfs_service_get
 };
 
@@ -593 +593 @@
                 sysarg_t rc;
                 async_wait_for(msg, &rc);
+
+                /* Do not propagate EHANGUP back to VFS. */
+                if ((int) rc == EHANGUP)
+                        rc = ENOTSUP;
                 
                 *rbytes = IPC_GET_ARG1(answer);
@@ -655 +659 @@
                 sysarg_t rc;
                 async_wait_for(msg, &rc);
+
+                /* Do not propagate EHANGUP back to VFS. */
+                if ((int) rc == EHANGUP)
+                        rc = ENOTSUP;
                 
                 *wbytes = IPC_GET_ARG1(answer);