Changeset 5126f80 in mainline for uspace/srv/vfs/vfs_file.c

Timestamp:

2017-03-08T11:42:17Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0d35511

Parents:

a737667e

git-author:

Jiri Zarevucky <zarevucky.jiri@…> (2017-03-08 11:42:17)

git-committer:

Jakub Jermar <jakub@…> (2017-03-08 11:42:17)

Message:

Merge from lp:~zarevucky-jiri/helenos/vfs-2.5/ revision 1946

Original commit messages:

1946: Jiri Zarevucky 2013-08-06 Relativize mount, add root handle to libc and remove root from VFS server. This wraps up the "relativization" phase.

Breakage:

• Dynamic builds broken
• Mount table lookups by name

File:

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

uspace/srv/vfs/vfs_file.c

@@ -178 +178 @@
                  * endpoint FS and drop our reference to the underlying VFS node.
                  */
-                if (file->open_read || file->open_write) {
-                        rc = vfs_file_close_remote(file);
-                }
-                vfs_node_delref(file->node);
+                
+                if (file->node != NULL) {
+                        if (file->open_read || file->open_write) {
+                                rc = vfs_file_close_remote(file);
+                        }
+                        vfs_node_delref(file->node);
+                }
                 free(file);
         }
@@ -312 +315 @@
 }
 
+static void _vfs_file_put(vfs_client_data_t *vfs_data, vfs_file_t *file)
+{
+        fibril_mutex_unlock(&file->_lock);
+        
+        fibril_mutex_lock(&vfs_data->lock);
+        vfs_file_delref(vfs_data, file);
+        fibril_mutex_unlock(&vfs_data->lock);
+}
+
 static vfs_file_t *_vfs_file_get(vfs_client_data_t *vfs_data, int fd)
 {
@@ -323 +335 @@
                         vfs_file_addref(vfs_data, file);
                         fibril_mutex_unlock(&vfs_data->lock);
+                        
                         fibril_mutex_lock(&file->_lock);
+                        if (file->node == NULL) {
+                                _vfs_file_put(vfs_data, file);
+                                return NULL;
+                        }
+                        assert(file != NULL);
+                        assert(file->node != NULL);
                         return file;
                 }
@@ -341 +360 @@
 {
         return _vfs_file_get(VFS_DATA, fd);
-}
-
-static void _vfs_file_put(vfs_client_data_t *vfs_data, vfs_file_t *file)
-{
-        fibril_mutex_unlock(&file->_lock);
-        
-        fibril_mutex_lock(&vfs_data->lock);
-        vfs_file_delref(vfs_data, file);
-        fibril_mutex_unlock(&vfs_data->lock);
 }