Changeset 2db4ac8 in mainline

Timestamp:

2008-01-27T16:19:25Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

15b9970

Parents:

72bde81

Message:

VFS_OPEN now understands O_CREAT and O_EXCL.

Location:

uspace

Files:

• lib/libc/include/fcntl.h (modified) (1 diff)
• srv/vfs/vfs_ops.c (modified) (5 diffs)

uspace/lib/libc/include/fcntl.h

@@ -36 +36 @@
 #define LIBC_FCNTL_H_
 
+#define O_CREAT         1
+#define O_EXCL          2
+#define O_TRUNC         4
+#define O_APPEND        8
+#define O_RDONLY        16
+#define O_RDWR          32
+#define O_WRONLY        64
+
 extern int open(const char *, int, ...);
 

uspace/srv/vfs/vfs_ops.c

@@ -48 +48 @@
 #include <unistd.h>
 #include <ctype.h>
+#include <fcntl.h>
 #include <assert.h>
 #include <atomic.h>
@@ -292 +293 @@
         size_t len;
 
+        if (oflag & O_CREAT)
+                lflag |= L_CREATE;
+        if (oflag & O_EXCL)
+                lflag |= L_EXCLUSIVE;
+
         ipc_callid_t callid;
 
@@ -326 +332 @@
          * triplet.
          */
-        rwlock_read_lock(&namespace_rwlock);
+        if (lflag & L_CREATE)
+                rwlock_write_lock(&namespace_rwlock);
+        else
+                rwlock_read_lock(&namespace_rwlock);
 
         /* The path is now populated and we can call vfs_lookup_internal(). */
@@ -332 +341 @@
         rc = vfs_lookup_internal(path, len, lflag, &lr, NULL);
         if (rc) {
-                rwlock_read_unlock(&namespace_rwlock);
+                if (lflag & L_CREATE)
+                        rwlock_write_unlock(&namespace_rwlock);
+                else
+                        rwlock_read_unlock(&namespace_rwlock);
                 ipc_answer_0(rid, rc);
                 free(path);
@@ -342 +354 @@
 
         vfs_node_t *node = vfs_node_get(&lr);
-        rwlock_read_unlock(&namespace_rwlock);
+        if (lflag & L_CREATE)
+                rwlock_write_unlock(&namespace_rwlock);
+        else
+                rwlock_read_unlock(&namespace_rwlock);
 
         /*