Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4444 → Rev 4445

/trunk/uspace/srv/vfs/vfs_ops.c
486,11 → 486,8
 
void vfs_open(ipc_callid_t rid, ipc_call_t *request)
{
async_serialize_start();
if (!vfs_files_init()) {
ipc_answer_0(rid, ENOMEM);
async_serialize_end();
return;
}
 
514,7 → 511,6
if ((lflag & (L_FILE | L_DIRECTORY)) == 0 ||
(lflag & (L_FILE | L_DIRECTORY)) == (L_FILE | L_DIRECTORY)) {
ipc_answer_0(rid, EINVAL);
async_serialize_end();
return;
}
 
528,7 → 524,6
if (!ipc_data_write_receive(&callid, &len)) {
ipc_answer_0(callid, EINVAL);
ipc_answer_0(rid, EINVAL);
async_serialize_end();
return;
}
char *path = malloc(len + 1);
535,7 → 530,6
if (!path) {
ipc_answer_0(callid, ENOMEM);
ipc_answer_0(rid, ENOMEM);
async_serialize_end();
return;
}
int rc;
542,7 → 536,6
if ((rc = ipc_data_write_finalize(callid, path, len))) {
ipc_answer_0(rid, rc);
free(path);
async_serialize_end();
return;
}
path[len] = '\0';
567,7 → 560,6
rwlock_read_unlock(&namespace_rwlock);
ipc_answer_0(rid, rc);
free(path);
async_serialize_end();
return;
}
 
590,7 → 582,6
rwlock_write_unlock(&node->contents_rwlock);
vfs_node_put(node);
ipc_answer_0(rid, rc);
async_serialize_end();
return;
}
node->size = 0;
606,7 → 597,6
if (fd < 0) {
vfs_node_put(node);
ipc_answer_0(rid, fd);
async_serialize_end();
return;
}
vfs_file_t *file = vfs_file_get(fd);
626,7 → 616,6
 
/* Success! Return the new file descriptor to the client. */
ipc_answer_1(rid, EOK, fd);
async_serialize_end();
}
 
void vfs_close(ipc_callid_t rid, ipc_call_t *request)
/trunk/uspace/srv/vfs/vfs_lookup.c
163,11 → 163,12
(ipcarg_t) root->dev_handle, (ipcarg_t) lflag, (ipcarg_t) index,
&answer);
vfs_release_phone(phone);
 
async_serialize_start();
ipcarg_t rc;
/* XXX shouldn't we disable fibril preemption here? */
async_wait_for(req, &rc);
 
async_serialize_end();
futex_down(&plb_futex);
list_remove(&entry.plb_link);
/*