Changeset 9c4cf0d in mainline for uspace/srv

Timestamp:

2017-04-02T11:24:06Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

151f1cc

Parents:

b19e892

Message:

Rename close() to vfs_put()

This is motivated mainly by the fact that a file handle does not
necessarily correspond to an open file and close() was no longer the
the opposite operation to open().

Location:

uspace/srv

Files:

• devman/match.c (modified) (1 diff)
• vfs/vfs.h (modified) (1 diff)
• vfs/vfs_ipc.c (modified) (4 diffs)
• vfs/vfs_ops.c (modified) (1 diff)

uspace/srv/devman/match.c

@@ -243 +243 @@
         
         if (opened)
-                close(fd);
+                vfs_put(fd);
         
         return suc;

uspace/srv/vfs/vfs.h

@@ -205 +205 @@
 
 extern int vfs_op_clone(int oldfd, int newfd, bool desc);
-extern int vfs_op_close(int fd);
 extern int vfs_op_mount(int mpfd, unsigned servid, unsigned flags, unsigned instance, const char *opts, const char *fsname, int *outfd);
 extern int vfs_op_mtab_get(void);
 extern int vfs_op_open(int fd, int flags);
+extern int vfs_op_put(int fd);
 extern int vfs_op_read(int fd, aoff64_t, size_t *out_bytes);
 extern int vfs_op_rename(int basefd, char *old, char *new);

uspace/srv/vfs/vfs_ipc.c

@@ -44 +44 @@
 }
 
-static void vfs_in_close(ipc_callid_t rid, ipc_call_t *request)
-{
-        int fd = IPC_GET_ARG1(*request);
-        int rc = vfs_op_close(fd);
-        async_answer_0(rid, rc);
-}
-
 static void vfs_in_mount(ipc_callid_t rid, ipc_call_t *request)
 {
@@ -105 +98 @@
 }
 
+static void vfs_in_put(ipc_callid_t rid, ipc_call_t *request)
+{
+        int fd = IPC_GET_ARG1(*request);
+        int rc = vfs_op_put(fd);
+        async_answer_0(rid, rc);
+}
+
 static void vfs_in_read(ipc_callid_t rid, ipc_call_t *request)
 {
@@ -268 +268 @@
                         vfs_in_clone(callid, &call);
                         break;
-                case VFS_IN_CLOSE:
-                        vfs_in_close(callid, &call);
-                        break;
                 case VFS_IN_MOUNT:
                         vfs_in_mount(callid, &call);
@@ -276 +273 @@
                 case VFS_IN_OPEN:
                         vfs_in_open(callid, &call);
+                        break;
+                case VFS_IN_PUT:
+                        vfs_in_put(callid, &call);
                         break;
                 case VFS_IN_READ:

uspace/srv/vfs/vfs_ops.c

@@ -124 +124 @@
 }
 
-int vfs_op_close(int fd)
+int vfs_op_put(int fd)
 {
         return vfs_fd_free(fd);