Changeset efedee77 in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2010-11-02T22:38:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

af894a21

Parents:

aab02fb (diff), e06ef614 (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/vfs/vfs_ops.c (modified) (16 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -131 +131 @@
                         if (rc != EOK) {
                                 async_wait_for(msg, NULL);
-                                vfs_release_phone(phone);
+                                vfs_release_phone(fs_handle, phone);
                                 fibril_rwlock_write_unlock(&namespace_rwlock);
                                 ipc_answer_0(rid, rc);
@@ -137 +137 @@
                         }
                         async_wait_for(msg, &rc);
-                        vfs_release_phone(phone);
+                        vfs_release_phone(fs_handle, phone);
                         
                         if (rc != EOK) {
@@ -196 +196 @@
         if (rc != EOK) {
                 async_wait_for(msg, NULL);
-                vfs_release_phone(mountee_phone);
-                vfs_release_phone(phone);
+                vfs_release_phone(fs_handle, mountee_phone);
+                vfs_release_phone(mp_res.triplet.fs_handle, phone);
                 /* Mount failed, drop reference to mp_node. */
                 if (mp_node)
@@ -206 +206 @@
         }
 
-        vfs_release_phone(mountee_phone);
+        vfs_release_phone(fs_handle, mountee_phone);
         
         /* send the mount options */
@@ -212 +212 @@
         if (rc != EOK) {
                 async_wait_for(msg, NULL);
-                vfs_release_phone(phone);
+                vfs_release_phone(mp_res.triplet.fs_handle, phone);
                 /* Mount failed, drop reference to mp_node. */
                 if (mp_node)
@@ -221 +221 @@
         }
         async_wait_for(msg, &rc);
-        vfs_release_phone(phone);
+        vfs_release_phone(mp_res.triplet.fs_handle, phone);
         
         if (rc == EOK) {
@@ -423 +423 @@
                 rc = async_req_1_0(phone, VFS_OUT_UNMOUNTED,
                     mr_node->dev_handle);
-                vfs_release_phone(phone);
+                vfs_release_phone(mr_node->fs_handle, phone);
                 if (rc != EOK) {
                         fibril_rwlock_write_unlock(&namespace_rwlock);
@@ -460 +460 @@
                 rc = async_req_2_0(phone, VFS_OUT_UNMOUNT, mp_node->dev_handle,
                     mp_node->index);
-                vfs_release_phone(phone);
+                vfs_release_phone(mp_node->fs_handle, phone);
                 if (rc != EOK) {
                         fibril_rwlock_write_unlock(&namespace_rwlock);
@@ -716 +716 @@
         async_wait_for(msg, &rc);
         
-        vfs_release_phone(fs_phone);
+        vfs_release_phone(file->node->fs_handle, fs_phone);
         fibril_mutex_unlock(&file->lock);
         
@@ -747 +747 @@
                 async_wait_for(msg, &rc);
                 
-                vfs_release_phone(fs_phone);
+                vfs_release_phone(file->node->fs_handle, fs_phone);
                 fibril_mutex_unlock(&file->lock);
                 
@@ -846 +846 @@
         }
         
-        vfs_release_phone(fs_phone);
+        vfs_release_phone(file->node->fs_handle, fs_phone);
         
         size_t bytes = IPC_GET_ARG1(answer);
@@ -970 +970 @@
         rc = async_req_4_0(fs_phone, VFS_OUT_TRUNCATE, (ipcarg_t) dev_handle,
             (ipcarg_t) index, LOWER32(size), UPPER32(size));
-        vfs_release_phone(fs_phone);
+        vfs_release_phone(fs_handle, fs_phone);
         return (int)rc;
 }
@@ -1026 +1026 @@
         ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
         async_wait_for(msg, &rc);
-        vfs_release_phone(fs_phone);
+        vfs_release_phone(file->node->fs_handle, fs_phone);
 
         fibril_mutex_unlock(&file->lock);
@@ -1077 +1077 @@
         ipcarg_t rv;
         async_wait_for(msg, &rv);
-        vfs_release_phone(fs_phone);
+        vfs_release_phone(node->fs_handle, fs_phone);
 
         ipc_answer_0(rid, rv);
@@ -1355 +1355 @@
                 int ret = vfs_close_internal(newfile);
                 if (ret != EOK) {
+                        fibril_mutex_unlock(&oldfile->lock);
                         ipc_answer_0(rid, ret);
                         return;
@@ -1361 +1362 @@
                 ret = vfs_fd_free(newfd);
                 if (ret != EOK) {
+                        fibril_mutex_unlock(&oldfile->lock);
                         ipc_answer_0(rid, ret);
                         return;