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

Timestamp:

2010-12-30T13:43:27Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d770deb

Parents:

d70d80ed (diff), f418e51 (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) (14 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -79 +79 @@
         size_t rsize;
         unsigned rlnkcnt;
-        ipcarg_t rc;
+        sysarg_t rc;
         int phone;
         aid_t msg;
@@ -126 +126 @@
                         phone = vfs_grab_phone(fs_handle);
                         msg = async_send_1(phone, VFS_OUT_MOUNTED,
-                            (ipcarg_t) devmap_handle, &answer);
+                            (sysarg_t) devmap_handle, &answer);
                         /* send the mount options */
                         rc = async_data_write_start(phone, (void *)opts,
@@ -188 +188 @@
         phone = vfs_grab_phone(mp_res.triplet.fs_handle);
         msg = async_send_4(phone, VFS_OUT_MOUNT,
-            (ipcarg_t) mp_res.triplet.devmap_handle,
-            (ipcarg_t) mp_res.triplet.index,
-            (ipcarg_t) fs_handle,
-            (ipcarg_t) devmap_handle, &answer);
+            (sysarg_t) mp_res.triplet.devmap_handle,
+            (sysarg_t) mp_res.triplet.index,
+            (sysarg_t) fs_handle,
+            (sysarg_t) devmap_handle, &answer);
         
         /* send connection */
@@ -309 +309 @@
         ipc_call_t data;
         ipc_callid_t callid = async_get_call(&data);
-        if (IPC_GET_METHOD(data) != IPC_M_PING) {
+        if (IPC_GET_IMETHOD(data) != IPC_M_PING) {
                 ipc_answer_0(callid, ENOTSUP);
                 ipc_answer_0(rid, ENOTSUP);
@@ -716 +716 @@
 
         /* Wait for reply from the FS server. */
-        ipcarg_t rc;
+        sysarg_t rc;
         async_wait_for(msg, &rc);
         
@@ -747 +747 @@
                 
                 /* Wait for reply from the FS server. */
-                ipcarg_t rc;
+                sysarg_t rc;
                 async_wait_for(msg, &rc);
                 
@@ -781 +781 @@
 static void vfs_rdwr(ipc_callid_t rid, ipc_call_t *request, bool read)
 {
+        vfs_info_t *vi;
 
         /*
@@ -807 +808 @@
         fibril_mutex_lock(&file->lock);
 
+        vi = fs_handle_to_info(file->node->fs_handle);
+        assert(vi);
+
         /*
          * Lock the file's node so that no other client can read/write to it at
-         * the same time.
-         */
-        if (read)
+         * the same time unless the FS supports concurrent reads/writes and its
+         * write implementation does not modify the file size.
+         */
+        if (read || (vi->concurrent_read_write && vi->write_retains_size))
                 fibril_rwlock_read_lock(&file->node->contents_rwlock);
         else
@@ -834 +839 @@
          * don't have to bother.
          */
-        ipcarg_t rc;
+        sysarg_t rc;
         ipc_call_t answer;
         if (read) {
@@ -857 +862 @@
         
         /* Unlock the VFS node. */
-        if (read)
+        if (read || (vi->concurrent_read_write && vi->write_retains_size))
                 fibril_rwlock_read_unlock(&file->node->contents_rwlock);
         else {
@@ -968 +973 @@
     fs_index_t index, aoff64_t size)
 {
-        ipcarg_t rc;
+        sysarg_t rc;
         int fs_phone;
         
         fs_phone = vfs_grab_phone(fs_handle);
-        rc = async_req_4_0(fs_phone, VFS_OUT_TRUNCATE, (ipcarg_t) devmap_handle,
-            (ipcarg_t) index, LOWER32(size), UPPER32(size));
+        rc = async_req_4_0(fs_phone, VFS_OUT_TRUNCATE, (sysarg_t) devmap_handle,
+            (sysarg_t) index, LOWER32(size), UPPER32(size));
         vfs_release_phone(fs_handle, fs_phone);
         return (int)rc;
@@ -1000 +1005 @@
 
         fibril_mutex_unlock(&file->lock);
-        ipc_answer_0(rid, (ipcarg_t)rc);
+        ipc_answer_0(rid, (sysarg_t)rc);
 }
 
@@ -1006 +1011 @@
 {
         int fd = IPC_GET_ARG1(*request);
-        ipcarg_t rc;
+        sysarg_t rc;
 
         vfs_file_t *file = vfs_file_get(fd);
@@ -1079 +1084 @@
         ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
         
-        ipcarg_t rv;
+        sysarg_t rv;
         async_wait_for(msg, &rv);
         vfs_release_phone(node->fs_handle, fs_phone);