Changeset 5eb5dcf in mainline for uspace/lib/libc/generic/vfs/vfs.c

Timestamp:

2010-01-06T20:56:04Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fccc236

Parents:

002252a (diff), eca2435 (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 mainline changes

File:

• uspace/lib/libc/generic/vfs/vfs.c (modified) (3 diffs)

uspace/lib/libc/generic/vfs/vfs.c

@@ -117 +117 @@
 }
 
-int mount(const char *fs_name, const char *mp, const char *dev,
+int mount(const char *fs_name, const char *mp, const char *fqdn,
     const char *opts, unsigned int flags)
 {
@@ -126 +126 @@
         dev_handle_t dev_handle;
         
-        res = devmap_device_get_handle(dev, &dev_handle, flags);
+        res = devmap_device_get_handle(fqdn, &dev_handle, flags);
         if (res != EOK)
                 return res;
@@ -703 +703 @@
         rc = fstat(fildes, &stat);
 
-        if (!stat.devfs_stat.device)
+        if (!stat.device)
                 return -1;
         
-        return devmap_device_connect(stat.devfs_stat.device, 0);
+        return devmap_device_connect(stat.device, 0);
 }