const char *path;
pthread_mutex_lock(&handle->lock);
- lttng_inode_get_location(handle->inode, NULL, &path);
+ lttng_inode_borrow_location(handle->inode, NULL, &path);
if (handle->fd >= 0) {
DBG_NO_LOC(" %s [active, fd %d%s]", path, handle->fd,
const struct lttng_directory_handle *node_directory_handle;
pthread_mutex_lock(&handle->lock);
- lttng_inode_get_location(handle->inode, &node_directory_handle, &path);
- assert(handle->fd >= 0);
+ lttng_inode_borrow_location(
+ handle->inode, &node_directory_handle, &path);
+ LTTNG_ASSERT(handle->fd >= 0);
if (handle->in_use) {
/* This handle can't be suspended as it is currently in use. */
ret = -EAGAIN;
const char *path;
const struct lttng_directory_handle *node_directory_handle;
- lttng_inode_get_location(handle->inode, &node_directory_handle, &path);
+ lttng_inode_borrow_location(
+ handle->inode, &node_directory_handle, &path);
- assert(handle->fd == -1);
- assert(path);
+ LTTNG_ASSERT(handle->fd == -1);
+ LTTNG_ASSERT(path);
ret = open_from_properties(
node_directory_handle, path, &handle->properties);
if (ret < 0) {
{
int ret = 0;
+ if (!tracker) {
+ goto end;
+ }
/*
* Refuse to destroy the tracker as fs_handles may still old
* weak references to the tracker.
if (tracker->unsuspendable_fds) {
ret = cds_lfht_destroy(tracker->unsuspendable_fds, NULL);
- assert(!ret);
+ LTTNG_ASSERT(!ret);
}
lttng_inode_registry_destroy(tracker->inode_registry);
} else {
/*
* There are not enough active suspendable file
- * descriptors to open a new fd and still accomodate the
+ * descriptors to open a new fd and still accommodates the
* tracker's capacity.
*/
WARN("Cannot open unsuspendable fd, too many unsuspendable file descriptors are opened (%u)",
*/
pthread_mutex_lock(&handle->tracker->lock);
pthread_mutex_lock(&handle->lock);
- assert(!handle->in_use);
+ LTTNG_ASSERT(!handle->in_use);
handle->tracker->stats.uses++;
if (handle->fd >= 0) {
const char *path = NULL;
struct fs_handle_tracked *handle =
container_of(_handle, struct fs_handle_tracked, parent);
+ struct lttng_directory_handle *inode_directory_handle = NULL;
if (!handle) {
ret = -EINVAL;
pthread_mutex_lock(&handle->tracker->lock);
pthread_mutex_lock(&handle->lock);
if (handle->inode) {
- lttng_inode_get_location(handle->inode, NULL, &path);
+ lttng_inode_borrow_location(handle->inode, NULL, &path);
+ /*
+ * Here a reference to the inode's directory handle is acquired
+ * to prevent the last reference to it from being released while
+ * the tracker's lock is taken.
+ *
+ * If this wasn't done, the directory handle could attempt to
+ * close its underlying directory file descriptor, which would
+ * attempt to lock the tracker's lock, resulting in a deadlock.
+ *
+ * Since a new reference to the directory handle is taken within
+ * the scope of this function, it is not possible for the last
+ * reference to the inode's location directory handle to be
+ * released during the call to lttng_inode_put().
+ *
+ * We wait until the tracker's lock is released to release the
+ * reference. Hence, the call to the tracker is delayed just
+ * enough to not attempt to recursively acquire the tracker's
+ * lock twice.
+ */
+ inode_directory_handle =
+ lttng_inode_get_location_directory_handle(
+ handle->inode);
}
fd_tracker_untrack(handle->tracker, handle);
if (handle->fd >= 0) {
* isn't much the user can do about it.
*/
if (close(handle->fd)) {
- PERROR("Failed to close the file descritptor (%d) of fs handle to %s, close() returned",
+ PERROR("Failed to close the file descriptor (%d) of fs handle to %s, close() returned",
handle->fd, path ? path : "Unknown");
}
handle->fd = -1;
pthread_mutex_destroy(&handle->lock);
pthread_mutex_unlock(&handle->tracker->lock);
free(handle);
+ lttng_directory_handle_put(inode_directory_handle);
end:
return ret;
}