Changeset 925a21e in mainline for uspace/srv/vfs/vfs_register.c
- Timestamp:
- 2011-09-24T14:20:29Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 5bf76c1
- Parents:
- 867e2555 (diff), 1ab4aca (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/vfs/vfs_register.c
r867e2555 r925a21e 154 154 * Check for duplicit registrations. 155 155 */ 156 if (fs_name_to_handle(fs_info->vfs_info.name, false)) { 156 if (fs_name_to_handle(fs_info->vfs_info.instance, 157 fs_info->vfs_info.name, false)) { 157 158 /* 158 159 * We already register a fs like this. … … 297 298 * 298 299 */ 299 fs_handle_t fs_name_to_handle( char *name, bool lock)300 fs_handle_t fs_name_to_handle(unsigned int instance, char *name, bool lock) 300 301 { 301 302 int handle = 0; … … 306 307 list_foreach(fs_list, cur) { 307 308 fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link); 308 if (str_cmp(fs->vfs_info.name, name) == 0) { 309 if (str_cmp(fs->vfs_info.name, name) == 0 && 310 instance == fs->vfs_info.instance) { 309 311 handle = fs->fs_handle; 310 312 break;
Note:
See TracChangeset
for help on using the changeset viewer.