/* File descriptor to a file open on the WIM filesystem. */
struct wimlib_fd {
- struct inode *inode;
- struct lookup_table_entry *lte;
+ struct inode *f_inode;
+ struct lookup_table_entry *f_lte;
int staging_fd;
u16 idx;
u32 stream_id;
return open_flags & (O_RDWR | O_WRONLY);
}
+/*
+ * Allocate a file descriptor for a stream.
+ *
+ * @inode: inode containing the stream we're opening
+ * @stream_id: ID of the stream we're opening
+ * @lte: Lookup table entry for the stream (may be NULL)
+ * @fd_ret: Return the allocated file descriptor if successful.
+ *
+ * Return 0 iff successful or error code if unsuccessful.
+ */
static int alloc_wimlib_fd(struct inode *inode,
u32 stream_id,
struct lookup_table_entry *lte,
if (inode->num_allocated_fds == max_fds)
return -EMFILE;
- num_new_fds = min(fds_per_alloc, max_fds - inode->num_allocated_fds);
+ num_new_fds = min(fds_per_alloc,
+ max_fds - inode->num_allocated_fds);
- fds = REALLOC(inode->fds, (inode->num_allocated_fds + num_new_fds) *
- sizeof(inode->fds[0]));
+ fds = REALLOC(inode->fds,
+ (inode->num_allocated_fds + num_new_fds) *
+ sizeof(inode->fds[0]));
if (!fds)
return -ENOMEM;
memset(&fds[inode->num_allocated_fds], 0,
struct wimlib_fd *fd = CALLOC(1, sizeof(*fd));
if (!fd)
return -ENOMEM;
- fd->inode = inode;
- fd->lte = lte;
+ fd->f_inode = inode;
+ fd->f_lte = lte;
fd->staging_fd = -1;
fd->idx = i;
fd->stream_id = stream_id;
{
wimlib_assert(fd);
wimlib_assert(inode);
- wimlib_assert(fd->inode == inode);
+ wimlib_assert(fd->f_inode == inode);
wimlib_assert(inode->num_opened_fds);
wimlib_assert(fd->idx < inode->num_opened_fds);
wimlib_assert(inode->fds[fd->idx] == fd);
static int lte_put_fd(struct lookup_table_entry *lte, struct wimlib_fd *fd)
{
wimlib_assert(fd);
- wimlib_assert(fd->lte == lte);
+ wimlib_assert(fd->f_lte == lte);
if (!lte) /* Empty stream with no lookup table entry */
return 0;
- wimlib_assert(lte->num_opened_fds);
+ /* Close staging file descriptor if needed. */
- if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
- wimlib_assert(lte->staging_file_name);
- wimlib_assert(fd->staging_fd != -1);
+ if (lte->resource_location == RESOURCE_IN_STAGING_FILE
+ && fd->staging_fd != -1)
+ {
if (close(fd->staging_fd) != 0) {
ERROR_WITH_ERRNO("Failed to close staging file");
return -errno;
return 0;
}
+/* Close a file descriptor. */
static int close_wimlib_fd(struct wimlib_fd *fd)
{
int ret;
+ wimlib_assert(fd);
DEBUG("Closing fd (inode = %lu, opened = %u, allocated = %u)",
- fd->inode->ino, fd->inode->num_opened_fds,
- fd->inode->num_allocated_fds);
- ret = lte_put_fd(fd->lte, fd);
+ fd->f_inode->ino, fd->f_inode->num_opened_fds,
+ fd->f_inode->num_allocated_fds);
+ ret = lte_put_fd(fd->f_lte, fd);
if (ret != 0)
return ret;
- inode_put_fd(fd->inode, fd);
+ inode_put_fd(fd->f_inode, fd);
return 0;
}
-/* Remove a dentry; i.e. remove a reference to the inode.
- *
- * If there are no remaining references to the inode either through detnries or
- * open file descriptors, the inode is freed.
+/* Remove a dentry; i.e. remove a reference to the corresponding inode.
*
- * All lookup table entries referenced by the inode have their reference count
- * decremented. If a lookup table entry has no open file descriptors and no
- * references remaining, it is freed, and the staging file is unlinked.
+ * If there are no remaining references to the inode either through dentries or
+ * open file descriptors, the inode is freed. Otherwise, the inode is not
+ * removed, but the dentry is unlinked and freed.
*
- * Otherwise, the inode is not removed, but the dentry is unlinked and freed. */
+ * Either way, all lookup table entries referenced by the inode have their
+ * reference count decremented. If a lookup table entry has no open file
+ * descriptors and no references remaining, it is freed, and the staging file is
+ * unlinked.
+ */
static void remove_dentry(struct dentry *dentry,
struct lookup_table *lookup_table)
{
- struct inode *inode = dentry->inode;
+ struct inode *inode = dentry->d_inode;
struct lookup_table_entry *lte;
unsigned i;
put_dentry(dentry);
}
-/* Remove an alternate data stream from the inode */
-static void inode_remove_ads(struct inode *inode, u16 idx,
- struct lookup_table *lookup_table)
-{
- struct ads_entry *ads_entry;
- struct lookup_table_entry *lte;
-
- ads_entry = inode->ads_entries[idx];
-
- wimlib_assert(ads_entry);
-
- lte = ads_entry->lte;
-
- if (lte)
- lte_decrement_refcnt(lte, lookup_table);
-
- free_ads_entry(ads_entry);
-
- wimlib_assert(inode->num_ads);
- memcpy(&inode->ads_entries[idx],
- &inode->ads_entries[idx + 1],
- (inode->num_ads - idx - 1) * sizeof(inode->ads_entries[0]));
- inode->num_ads--;
-}
-
-/* Transfers file attributes from a struct inode to a `stat' buffer.
- *
- * The lookup table entry tells us which stream in the inode we are statting.
- * For a named data stream, everything returned is the same as the unnamed data
- * stream except possibly the size and block count. */
-int inode_to_stbuf(const struct inode *inode, struct lookup_table_entry *lte,
- struct stat *stbuf)
-{
- if (inode_is_symlink(inode))
- stbuf->st_mode = S_IFLNK | 0777;
- else if (inode_is_directory(inode))
- stbuf->st_mode = S_IFDIR | 0755;
- else
- stbuf->st_mode = S_IFREG | 0644;
-
- stbuf->st_ino = (ino_t)inode->ino;
- stbuf->st_nlink = inode->link_count;
- stbuf->st_uid = getuid();
- stbuf->st_gid = getgid();
-
- if (lte) {
- if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
- wimlib_assert(mount_flags & WIMLIB_MOUNT_FLAG_READWRITE);
- wimlib_assert(lte->staging_file_name);
- struct stat native_stat;
- if (stat(lte->staging_file_name, &native_stat) != 0) {
- DEBUG("Failed to stat `%s': %m",
- lte->staging_file_name);
- return -errno;
- }
- stbuf->st_size = native_stat.st_size;
- } else {
- stbuf->st_size = wim_resource_size(lte);
- }
- } else {
- stbuf->st_size = 0;
- }
-
- stbuf->st_atime = wim_timestamp_to_unix(inode->last_access_time);
- stbuf->st_mtime = wim_timestamp_to_unix(inode->last_write_time);
- stbuf->st_ctime = wim_timestamp_to_unix(inode->creation_time);
- stbuf->st_blocks = (stbuf->st_size + 511) / 512;
- return 0;
-}
-
/* Creates a new staging file and returns its file descriptor opened for
* writing.
*
int fd;
struct lookup_table_entry *old_lte, *new_lte;
+ DEBUG("Extracting resource to staging dir: inode %"PRIu64", "
+ "stream id %"PRIu32, inode->ino, stream_id);
+
old_lte = *lte;
fd = create_staging_file(&staging_file_name, O_WRONLY);
if (fd == -1)
struct wimlib_fd *fd = inode->fds[i];
if (fd) {
if (fd->stream_id == stream_id) {
- wimlib_assert(fd->lte == old_lte);
- fd->lte = new_lte;
+ wimlib_assert(fd->f_lte == old_lte);
+ wimlib_assert(fd->staging_fd == -1);
+ fd->f_lte = new_lte;
new_lte->num_opened_fds++;
fd->staging_fd = open(staging_file_name, O_RDONLY);
if (fd->staging_fd == -1) {
new_lte->resource_entry.original_size = size;
new_lte->refcnt = inode->link_count;
- new_lte->staging_file_name = staging_file_name;
new_lte->resource_location = RESOURCE_IN_STAGING_FILE;
- new_lte->inode = inode;
+ new_lte->staging_file_name = staging_file_name;
+ new_lte->lte_inode = inode;
random_hash(new_lte->hash);
if (stream_id == 0)
inode->lte = new_lte;
else
for (u16 i = 0; i < inode->num_ads; i++)
- if (inode->ads_entries[i]->stream_id == stream_id)
- inode->ads_entries[i]->lte = new_lte;
+ if (inode->ads_entries[i].stream_id == stream_id)
+ inode->ads_entries[i].lte = new_lte;
lookup_table_insert(w->lookup_table, new_lte);
list_add(&new_lte->staging_list, &staging_list);
out_revert_fd_changes:
for (u16 i = 0, j = 0; j < new_lte->num_opened_fds; i++) {
struct wimlib_fd *fd = inode->fds[i];
- if (fd && fd->stream_id == stream_id && fd->lte == new_lte) {
- fd->lte = old_lte;
+ if (fd && fd->stream_id == stream_id && fd->f_lte == new_lte) {
+ fd->f_lte = old_lte;
if (fd->staging_fd != -1) {
close(fd->staging_fd);
fd->staging_fd = -1;
return 0;
}
+static void inode_update_lte_ptr(struct inode *inode,
+ struct lookup_table_entry *old_lte,
+ struct lookup_table_entry *new_lte)
+{
+ if (inode->lte == old_lte) {
+ inode->lte = new_lte;
+ } else {
+ for (unsigned i = 0; i < inode->num_ads; i++) {
+ if (inode->ads_entries[i].lte == old_lte) {
+ inode->ads_entries[i].lte = new_lte;
+ break;
+ }
+ }
+ }
+}
+
static int update_lte_of_staging_file(struct lookup_table_entry *lte,
struct lookup_table *table)
{
/* Merge duplicate lookup table entries */
duplicate_lte->refcnt += lte->refcnt;
list_del(<e->staging_list);
+ inode_update_lte_ptr(lte->lte_inode, lte, duplicate_lte);
free_lookup_table_entry(lte);
} else {
if (stat(lte->staging_file_name, &stbuf) != 0) {
ERROR_WITH_ERRNO("Failed to stat `%s'", lte->staging_file_name);
return WIMLIB_ERR_STAT;
}
- wimlib_assert(<e->file_on_disk == <e->staging_file_name);
- lte->resource_location = RESOURCE_IN_FILE_ON_DISK;
- copy_hash(lte->hash, hash);
- lte->resource_entry.original_size = stbuf.st_size;
- lte->resource_entry.size = stbuf.st_size;
- lte->inode = NULL;
- lookup_table_insert(table, lte);
+ if (stbuf.st_size == 0) {
+ /* Zero-length stream. No lookup table entry needed. */
+ inode_update_lte_ptr(lte->lte_inode, lte, NULL);
+ free_lookup_table_entry(lte);
+ } else {
+ wimlib_assert(<e->file_on_disk == <e->staging_file_name);
+ lte->resource_entry.original_size = stbuf.st_size;
+ lte->resource_entry.size = stbuf.st_size;
+ lte->resource_location = RESOURCE_IN_FILE_ON_DISK;
+ lte->lte_inode = NULL;
+ copy_hash(lte->hash, hash);
+ lookup_table_insert(table, lte);
+ }
}
-
return 0;
}
static int inode_close_fds(struct inode *inode)
{
- for (u16 i = 0, j = 0; j < inode->num_opened_fds; i++) {
+ u16 num_opened_fds = inode->num_opened_fds;
+ for (u16 i = 0, j = 0; j < num_opened_fds; i++) {
struct wimlib_fd *fd = inode->fds[i];
if (fd) {
- wimlib_assert(fd->inode == inode);
+ wimlib_assert(fd->f_inode == inode);
int ret = close_wimlib_fd(fd);
if (ret != 0)
return ret;
return 0;
}
-/*static int dentry_close_fds(struct dentry *dentry, void *ignore)*/
-/*{*/
- /*return inode_close_fds(dentry->inode);*/
-/*}*/
-
/* Overwrites the WIM file, with changes saved. */
static int rebuild_wim(WIMStruct *w, bool check_integrity)
{
DEBUG("Closing all staging file descriptors.");
list_for_each_entry(lte, &staging_list, staging_list) {
- ret = inode_close_fds(lte->inode);
+ ret = inode_close_fds(lte->lte_inode);
if (ret != 0)
return ret;
}
- /*ret = for_dentry_in_tree(wim_root_dentry(w), dentry_close_fds, NULL);*/
- /*if (ret != 0)*/
- /*return ret;*/
DEBUG("Calculating SHA1 checksums for all new staging files.");
list_for_each_entry_safe(lte, tmp, &staging_list, staging_list) {
struct fuse_file_info *fi)
{
struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
- return inode_to_stbuf(fd->inode, fd->lte, stbuf);
+ return inode_to_stbuf(fd->f_inode, fd->f_lte, stbuf);
}
static int wimfs_ftruncate(const char *path, off_t size,
int ret = ftruncate(fd->staging_fd, size);
if (ret != 0)
return ret;
- if (fd->lte && size < fd->lte->resource_entry.original_size)
- fd->lte->resource_entry.original_size = size;
+ if (fd->f_lte && size < fd->f_lte->resource_entry.original_size)
+ fd->f_lte->resource_entry.original_size = size;
return 0;
}
&dentry, <e, NULL);
if (ret != 0)
return ret;
- return inode_to_stbuf(dentry->inode, lte, stbuf);
+ return inode_to_stbuf(dentry->d_inode, lte, stbuf);
}
#ifdef ENABLE_XATTR
size_t size)
{
int ret;
- struct dentry *dentry;
+ struct inode *inode;
struct ads_entry *ads_entry;
size_t res_size;
struct lookup_table_entry *lte;
return -ENOATTR;
name += 5;
- dentry = get_dentry(w, path);
- if (!dentry)
+ inode = wim_pathname_to_inode(w, path);
+ if (!inode)
return -ENOENT;
- ads_entry = inode_get_ads_entry(dentry->inode, name, NULL);
+
+ ads_entry = inode_get_ads_entry(inode, name, NULL);
if (!ads_entry)
return -ENOATTR;
if (size == 0)
return res_size;
+
if (res_size > size)
return -ERANGE;
+
ret = read_full_wim_resource(lte, (u8*)value);
if (ret != 0)
return -EIO;
+
return res_size;
}
#endif
/* Create a hard link */
static int wimfs_link(const char *to, const char *from)
{
- struct dentry *to_dentry, *from_dentry, *from_dentry_parent;
+ struct dentry *from_dentry, *from_dentry_parent;
const char *link_name;
struct inode *inode;
- unsigned i;
struct lookup_table_entry *lte;
- to_dentry = get_dentry(w, to);
- if (!to_dentry)
+ inode = wim_pathname_to_inode(w, to);
+ if (!inode)
return -ENOENT;
- inode = to_dentry->inode;
-
if (!inode_is_regular_file(inode))
return -EPERM;
inode_add_dentry(from_dentry, inode);
- from_dentry->inode = inode;
+ from_dentry->d_inode = inode;
inode->link_count++;
- for (i = 0; i <= inode->num_ads; i++) {
+ for (unsigned i = 0; i <= inode->num_ads; i++) {
lte = inode_stream_lte_resolved(inode, i);
if (lte)
lte->refcnt++;
#ifdef ENABLE_XATTR
static int wimfs_listxattr(const char *path, char *list, size_t size)
{
- struct dentry *dentry;
int ret;
- char *p = list;
size_t needed_size;
unsigned i;
struct inode *inode;
+
if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
return -ENOTSUP;
/* List alternate data streams, or get the list size */
- ret = lookup_resource(w, path, get_lookup_flags(), &dentry, NULL, NULL);
- if (ret != 0)
- return ret;
- inode = dentry->inode;
+ inode = wim_pathname_to_inode(w, path);
+ if (!inode)
+ return -ENOENT;
if (size == 0) {
needed_size = 0;
for (i = 0; i < inode->num_ads; i++)
- needed_size += inode->ads_entries[i]->stream_name_utf8_len + 6;
+ needed_size += inode->ads_entries[i].stream_name_utf8_len + 6;
return needed_size;
} else {
+ char *p = list;
for (i = 0; i < inode->num_ads; i++) {
- needed_size = inode->ads_entries[i]->stream_name_utf8_len + 6;
+ needed_size = inode->ads_entries[i].stream_name_utf8_len + 6;
if (needed_size > size)
return -ERANGE;
p += sprintf(p, "user.%s",
- inode->ads_entries[i]->stream_name_utf8) + 1;
+ inode->ads_entries[i].stream_name_utf8) + 1;
size -= needed_size;
}
return p - list;
return -EEXIST;
newdir = new_dentry_with_inode(basename);
- newdir->inode->attributes |= FILE_ATTRIBUTE_DIRECTORY;
- newdir->inode->resolved = true;
- newdir->inode->ino = next_ino++;
+ newdir->d_inode->attributes |= FILE_ATTRIBUTE_DIRECTORY;
+ newdir->d_inode->resolved = true;
+ newdir->d_inode->ino = next_ino++;
link_dentry(newdir, parent);
return 0;
}
-
/* Creates a regular file. */
static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
{
&& (stream_name = path_stream_name(path))) {
/* Make an alternate data stream */
struct ads_entry *new_entry;
- struct dentry *dentry;
+ struct inode *inode;
char *p = (char*)stream_name - 1;
wimlib_assert(*p == ':');
*p = '\0';
- dentry = get_dentry(w, path);
- if (!dentry || !dentry_is_regular_file(dentry))
+ inode = wim_pathname_to_inode(w, path);
+ if (!inode)
+ return -ENOENT;
+ if (!inode_is_regular_file(inode))
return -ENOENT;
- if (inode_get_ads_entry(dentry->inode, stream_name, NULL))
+ if (inode_get_ads_entry(inode, stream_name, NULL))
return -EEXIST;
- new_entry = inode_add_ads(dentry->inode, stream_name);
+ new_entry = inode_add_ads(inode, stream_name);
if (!new_entry)
- return -ENOENT;
+ return -ENOMEM;
} else {
struct dentry *dentry, *parent;
const char *basename;
dentry = new_dentry_with_inode(basename);
if (!dentry)
return -ENOMEM;
- dentry->inode->resolved = true;
- dentry->inode->ino = next_ino++;
+ dentry->d_inode->resolved = true;
+ dentry->d_inode->ino = next_ino++;
link_dentry(dentry, parent);
}
return 0;
if (ret != 0)
return ret;
- inode = dentry->inode;
+ inode = dentry->d_inode;
if (stream_idx == 0)
stream_id = 0;
else
- stream_id = inode->ads_entries[stream_idx - 1]->stream_id;
+ stream_id = inode->ads_entries[stream_idx - 1].stream_id;
/* The file resource may be in the staging directory (read-write mounts
* only) or in the WIM. If it's in the staging directory, we need to
* we can read the file resource directly from the WIM file if we are
* opening it read-only, but we need to extract the resource to the
* staging directory if we are opening it writable. */
+
if (flags_writable(fi->flags) &&
(!lte || lte->resource_location != RESOURCE_IN_STAGING_FILE)) {
u64 size = (lte) ? wim_resource_size(lte) : 0;
if (!fd)
return -EBADF;
- if (!fd->lte) /* Empty stream with no lookup table entry */
+ if (!fd->f_lte) /* Empty stream with no lookup table entry */
return 0;
- if (fd->lte->resource_location == RESOURCE_IN_STAGING_FILE) {
+ if (fd->f_lte->resource_location == RESOURCE_IN_STAGING_FILE) {
/* Read from staging file */
- wimlib_assert(fd->lte->staging_file_name);
+ wimlib_assert(fd->f_lte->staging_file_name);
wimlib_assert(fd->staging_fd != -1);
ssize_t ret;
} else {
/* Read from WIM */
- u64 res_size = wim_resource_size(fd->lte);
+ u64 res_size = wim_resource_size(fd->f_lte);
if (offset > res_size)
return -EOVERFLOW;
size = min(size, res_size - offset);
- if (read_wim_resource(fd->lte, (u8*)buf,
+ if (read_wim_resource(fd->f_lte, (u8*)buf,
size, offset, false) != 0)
return -EIO;
return size;
if (!fd)
return -EBADF;
- inode = fd->inode;
+ inode = fd->f_inode;
filler(buf, ".", NULL, 0);
filler(buf, "..", NULL, 0);
static int wimfs_readlink(const char *path, char *buf, size_t buf_len)
{
- struct dentry *dentry = get_dentry(w, path);
+ struct inode *inode = wim_pathname_to_inode(w, path);
int ret;
- if (!dentry)
+ if (!inode)
return -ENOENT;
- if (!dentry_is_symlink(dentry))
+ if (!inode_is_symlink(inode))
return -EINVAL;
- ret = inode_readlink(dentry->inode, buf, buf_len, w);
+ ret = inode_readlink(inode, buf, buf_len, w);
if (ret > 0)
ret = 0;
return ret;
static int wimfs_release(const char *path, struct fuse_file_info *fi)
{
struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
- wimlib_assert(fd);
return close_wimlib_fd(fd);
}
+/* Close a directory */
static int wimfs_releasedir(const char *path, struct fuse_file_info *fi)
{
struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
- wimlib_assert(fd);
return close_wimlib_fd(fd);
}
/* Remove an alternate data stream through the XATTR interface */
static int wimfs_removexattr(const char *path, const char *name)
{
- struct dentry *dentry;
+ struct inode *inode;
struct ads_entry *ads_entry;
u16 ads_idx;
if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
return -ENOATTR;
name += 5;
- dentry = get_dentry(w, path);
- if (!dentry)
+ inode = wim_pathname_to_inode(w, path);
+ if (!inode)
return -ENOENT;
- ads_entry = inode_get_ads_entry(dentry->inode, name, &ads_idx);
+ ads_entry = inode_get_ads_entry(inode, name, &ads_idx);
if (!ads_entry)
return -ENOATTR;
- inode_remove_ads(dentry->inode, ads_idx, w->lookup_table);
+ inode_remove_ads(inode, ads_idx, w->lookup_table);
return 0;
}
#endif
* directory */
if (!dentry_is_directory(dst))
return -ENOTDIR;
- if (dst->inode->children != NULL)
+ if (dst->d_inode->children != NULL)
return -ENOTEMPTY;
}
parent_of_dst = dst->parent;
dentry = new_dentry_with_inode(link_name);
if (!dentry)
return -ENOMEM;
- inode = dentry->inode;
+ inode = dentry->d_inode;
inode->attributes = FILE_ATTRIBUTE_REPARSE_POINT;
inode->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
if (!lte) /* Already a zero-length file */
return 0;
- inode = dentry->inode;
+ inode = dentry->d_inode;
if (stream_idx == 0)
stream_id = 0;
else
- stream_id = inode->ads_entries[stream_idx - 1]->stream_id;
+ stream_id = inode->ads_entries[stream_idx - 1].stream_id;
if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
wimlib_assert(lte->staging_file_name);
if (stream_idx == 0)
remove_dentry(dentry, w->lookup_table);
else
- inode_remove_ads(dentry->inode, stream_idx - 1, w->lookup_table);
+ inode_remove_ads(dentry->d_inode, stream_idx - 1, w->lookup_table);
return 0;
}
dentry = get_dentry(w, path);
if (!dentry)
return -ENOENT;
- inode = dentry->inode;
+ inode = dentry->d_inode;
if (tv[0].tv_nsec != UTIME_OMIT) {
if (tv[0].tv_nsec == UTIME_NOW)
dentry = get_dentry(w, path);
if (!dentry)
return -ENOENT;
- inode = dentry->inode;
+ inode = dentry->d_inode;
inode->last_write_time = unix_timestamp_to_wim(times->modtime);
inode->last_access_time = unix_timestamp_to_wim(times->actime);
if (!fd)
return -EBADF;
- wimlib_assert(fd->lte);
- wimlib_assert(fd->lte->staging_file_name);
+ wimlib_assert(fd->f_lte);
+ wimlib_assert(fd->f_lte->staging_file_name);
wimlib_assert(fd->staging_fd != -1);
- wimlib_assert(fd->inode);
+ wimlib_assert(fd->f_inode);
/* Seek to the requested position */
if (lseek(fd->staging_fd, offset, SEEK_SET) == -1)
return -errno;
now = get_wim_timestamp();
- fd->inode->last_write_time = now;
- fd->inode->last_access_time = now;
+ fd->f_inode->last_write_time = now;
+ fd->f_inode->last_access_time = now;
return ret;
}
wim->lookup_table = joined_tab;
}
- ret = wimlib_select_image(wim, image);
+ ret = select_wim_image(wim, image);
if (ret != 0)
goto out;
DEBUG("Selected image %d", image);
+ if (imd->root_dentry->refcnt != 1) {
+ ERROR("Cannot mount image that was just exported with "
+ "wimlib_export()");
+ return WIMLIB_ERR_INVALID_PARAM;
+ }
+
next_ino = assign_inode_numbers(&imd->inode_list);
DEBUG("(next_ino = %"PRIu64")", next_ino);