Changeset 1dff985 in mainline for uspace/srv/vfs/vfs_file.c

Timestamp:

2017-03-03T21:32:38Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c577a9a

Parents:

5b46ec8 (diff), b8dbe2f (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 from lp:~zarevucky-jiri/helenos/vfs-2.5 up to revision 1926

File:

• uspace/srv/vfs/vfs_file.c (modified) (2 diffs)

uspace/srv/vfs/vfs_file.c

@@ -177 +177 @@
                  * endpoint FS and drop our reference to the underlying VFS node.
                  */
-                rc = vfs_file_close_remote(file);
+                if (file->open_read || file->open_write) {
+                        rc = vfs_file_close_remote(file);
+                }
                 vfs_node_delref(file->node);
                 free(file);
@@ -393 +395 @@
          */
         acceptor_file->node = donor_file->node;
+        acceptor_file->permissions = donor_file->permissions;
+        
+        // TODO: The file should not inherit its open status, but clients depend on this.
+        acceptor_file->pos = donor_file->pos;
         acceptor_file->append = donor_file->append;
-        acceptor_file->pos = donor_file->pos;
+        acceptor_file->open_read = donor_file->open_read;
+        acceptor_file->open_write = donor_file->open_write;
 
 out: