Changeset 67f63c4 in mainline for uspace/srv/vfs/vfs_rdwr.c

Timestamp:

2008-01-08T20:47:39Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

861e7d1

Parents:

7fff5eab

Message:

Make uspace rwlock API naming conventions consistent with kernel rwlock API.

File:

• uspace/srv/vfs/vfs_rdwr.c (modified) (3 diffs)

uspace/srv/vfs/vfs_rdwr.c

@@ -94 +94 @@
          */
         if (read)
-                rwlock_reader_lock(&file->node->contents_rwlock);
+                rwlock_read_lock(&file->node->contents_rwlock);
         else
-                rwlock_writer_lock(&file->node->contents_rwlock);
+                rwlock_write_lock(&file->node->contents_rwlock);
 
         int fs_phone = vfs_grab_phone(file->node->fs_handle);   
@@ -129 +129 @@
          */
         if (read)
-                rwlock_reader_unlock(&file->node->contents_rwlock);
+                rwlock_read_unlock(&file->node->contents_rwlock);
         else {
                 /* Update the cached version of node's size. */
                 file->node->size = IPC_GET_ARG2(answer); 
-                rwlock_writer_unlock(&file->node->contents_rwlock);
+                rwlock_write_unlock(&file->node->contents_rwlock);
         }
 
@@ -197 +197 @@
         }
         if (whence == SEEK_END) {
-                rwlock_reader_lock(&file->node->contents_rwlock);
+                rwlock_read_lock(&file->node->contents_rwlock);
                 size_t size = file->node->size;
-                rwlock_reader_unlock(&file->node->contents_rwlock);
+                rwlock_read_unlock(&file->node->contents_rwlock);
                 if (size + off < size) {
                         futex_up(&file->lock);