diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
| commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
| tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /libtrivfs | |
| parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
| parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) | |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'libtrivfs')
| -rw-r--r-- | libtrivfs/file-reparent.c | 5 | ||||
| -rw-r--r-- | libtrivfs/trivfs.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libtrivfs/file-reparent.c b/libtrivfs/file-reparent.c index c07fbccb..0682a912 100644 --- a/libtrivfs/file-reparent.c +++ b/libtrivfs/file-reparent.c @@ -27,5 +27,8 @@ trivfs_S_file_reparent (struct trivfs_protid *cred, mach_port_t *new, mach_msg_type_name_t *new_type) { /* This is not a directory, so we just duplicate it */ - return trivfs_S_io_duplicate (cred, reply, reply_type, new, new_type); + error_t ret = trivfs_S_io_duplicate (cred, reply, reply_type, new, new_type); + if (!ret) + mach_port_deallocate (mach_task_self (), parent); + return ret; } diff --git a/libtrivfs/trivfs.h b/libtrivfs/trivfs.h index 6e087f31..798e0b38 100644 --- a/libtrivfs/trivfs.h +++ b/libtrivfs/trivfs.h @@ -96,7 +96,7 @@ extern int trivfs_cntl_nportclasses; /* The user must define this function. This should modify a struct stat (as returned from the underlying node) for presentation to - callers of io_stat. It is permissable for this function to do + callers of io_stat. It is permissible for this function to do nothing. */ void trivfs_modify_stat (struct trivfs_protid *cred, io_statbuf_t *); |