/*
* mount_image.c
*
- * This file implements mounting of WIM files using FUSE, which stands for
- * Filesystem in Userspace. FUSE allows a filesystem to be implemented in a
- * userspace process by implementing the filesystem primitives--- read(),
- * write(), readdir(), etc.
+ * This file implements mounting of WIM images using FUSE
+ * (Filesystem in Userspace). See http://fuse.sourceforge.net/.
+ *
+ * Currently it is only expected to work on Linux.
*/
/*
- * Copyright (C) 2012, 2013, 2014 Eric Biggers
- *
- * This file is part of wimlib, a library for working with WIM files.
+ * Copyright (C) 2012, 2013, 2014, 2015 Eric Biggers
*
- * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option)
- * any later version.
+ * This file is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
*
- * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
*
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
*/
#ifdef HAVE_CONFIG_H
#endif
#include "wimlib.h"
+#include "wimlib/error.h"
#ifdef WITH_FUSE
# error "FUSE mount not supported on Windows! Please configure --without-fuse"
#endif
-#include "wimlib/dentry.h"
-#include "wimlib/encoding.h"
-#include "wimlib/metadata.h"
-#include "wimlib/paths.h"
-#include "wimlib/progress.h"
-#include "wimlib/reparse.h"
-#include "wimlib/timestamp.h"
-#include "wimlib/unix_data.h"
-#include "wimlib/write.h"
-#include "wimlib/xml.h"
+#define FUSE_USE_VERSION 26
+#include <attr/xattr.h>
#include <dirent.h>
#include <errno.h>
+#include <fuse.h>
#include <limits.h>
#include <mqueue.h>
#include <pthread.h>
#include <unistd.h>
#include <utime.h>
-#define FUSE_USE_VERSION 26
-#include <fuse.h>
-#include <attr/xattr.h>
+#include "wimlib/blob_table.h"
+#include "wimlib/dentry.h"
+#include "wimlib/encoding.h"
+#include "wimlib/metadata.h"
+#include "wimlib/paths.h"
+#include "wimlib/progress.h"
+#include "wimlib/reparse.h"
+#include "wimlib/timestamp.h"
+#include "wimlib/unix_data.h"
+#include "wimlib/write.h"
+#include "wimlib/xml.h"
#ifndef O_NOFOLLOW
# define O_NOFOLLOW 0 /* Security only... */
* that reference it. */
struct wim_inode *f_inode;
- /* Pointer to the lookup table entry for the data stream that has been
- * opened. 'num_opened_fds' of the lookup table entry tracks the number
- * of file descriptors that reference it. Or, this value may be NULL,
+ /* Pointer to the blob descriptor for the data stream that has been
+ * opened. 'num_opened_fds' of the blob descriptor tracks the number of
+ * file descriptors that reference it. Or, this value may be NULL,
* which indicates that the opened stream is empty and consequently does
- * not have a lookup table entry. */
- struct wim_lookup_table_entry *f_lte;
+ * not have a blob descriptor. */
+ struct blob_descriptor *f_blob;
/* If valid (filedes_valid(&f_staging_fd)), this contains the
* corresponding native file descriptor for the staging file that has
u16 f_idx;
/* Unique ID of the opened stream in the inode. This will stay the same
- * even if the indices of the inode's alternate data streams are changed
- * by a deletion. */
+ * even if the indices of the inode's streams are changed by a deletion.
+ */
u32 f_stream_id;
};
/* Number of file descriptors open to the mounted WIM image. */
unsigned long num_open_fds;
- /* Original list of single-instance streams in the mounted image, linked
- * by 'struct wim_lookup_table_entry'.orig_stream_list. */
- struct list_head orig_stream_list;
+ /* Original list of blobs in the mounted image, linked by
+ * 'struct blob_descriptor'.orig_blob_list. */
+ struct list_head orig_blob_list;
+
+ /* Parameters for unmounting the image (can be set via extended
+ * attribute "wimfs.unmount_info"). */
+ struct wimfs_unmount_info unmount_info;
};
#define WIMFS_CTX(fuse_ctx) ((struct wimfs_context*)(fuse_ctx)->private_data)
return wimfs_get_context()->wim;
}
-static inline int
-get_lookup_flags(const struct wimfs_context *ctx)
-{
- return ctx->default_lookup_flags;
-}
-
/* Is write permission requested on the file? */
static inline bool
flags_writable(int open_flags)
* Allocate a file descriptor to a data stream in the mounted WIM image.
*
* @inode
- * A pointer to the inode containing the stream being opened.
- * @stream_id
- * The ID of the data stream being opened within the inode.
- * @lte
- * A pointer to the lookup table entry for the stream data. Or, for a
- * 0-byte stream, this may be NULL.
+ * The inode containing the stream being opened
+ * @strm
+ * The stream of the inode being opened
* @fd_ret
* On success, a pointer to the new file descriptor will be stored here.
*
*/
static int
alloc_wimfs_fd(struct wim_inode *inode,
- u32 stream_id,
- struct wim_lookup_table_entry *lte,
+ struct wim_inode_stream *strm,
struct wimfs_fd **fd_ret)
{
static const u16 min_fds_per_alloc = 8;
return -ENOMEM;
fd->f_inode = inode;
- fd->f_lte = lte;
+ fd->f_blob = stream_blob_resolved(strm);
filedes_invalidate(&fd->f_staging_fd);
fd->f_idx = i;
- fd->f_stream_id = stream_id;
+ fd->f_stream_id = strm->stream_id;
*fd_ret = fd;
inode->i_fds[i] = fd;
inode->i_num_opened_fds++;
- if (lte)
- lte->num_opened_fds++;
+ if (fd->f_blob)
+ fd->f_blob->num_opened_fds++;
wimfs_inc_num_open_fds();
inode->i_next_fd = i + 1;
return 0;
if (filedes_close(&fd->f_staging_fd))
ret = -errno;
- /* Release this file descriptor from its lookup table entry. */
- if (fd->f_lte)
- lte_decrement_num_opened_fds(fd->f_lte);
+ /* Release this file descriptor from its blob descriptor. */
+ if (fd->f_blob)
+ blob_decrement_num_opened_fds(fd->f_blob);
wimfs_dec_num_open_fds();
if (fd->f_idx < inode->i_next_fd)
inode->i_next_fd = fd->f_idx;
FREE(fd);
- if (--inode->i_num_opened_fds == 0) {
- /* The last file descriptor to this inode was closed. */
- FREE(inode->i_fds);
- inode->i_fds = NULL;
- inode->i_num_allocated_fds = 0;
- if (inode->i_nlink == 0)
- /* No links to this inode remain. Get rid of it. */
- free_inode(inode);
- }
+ inode_dec_num_opened_fds(inode);
return ret;
}
return dentry->d_inode;
}
+/* Can look up named data stream with colon syntax */
+#define LOOKUP_FLAG_ADS_OK 0x01
+
+/* Can look up directory (otherwise get -ENOTDIR) */
+#define LOOKUP_FLAG_DIRECTORY_OK 0x02
+
+/* Get the data stream of the specified name from the specified inode. Returns
+ * NULL with errno set if not found. */
+static struct wim_inode_stream *
+inode_get_data_stream_tstr(const struct wim_inode *inode,
+ const char *stream_name)
+{
+ struct wim_inode_stream *strm;
+
+ if (!stream_name || !*stream_name) {
+ strm = inode_get_unnamed_stream(inode, STREAM_TYPE_DATA);
+ } else {
+ const utf16lechar *uname;
+
+ if (tstr_get_utf16le(stream_name, &uname))
+ return NULL;
+ strm = inode_get_stream(inode, STREAM_TYPE_DATA, uname);
+ tstr_put_utf16le(uname);
+ }
+ if (!strm)
+ errno = ENOENT;
+ return strm;
+}
+
+/*
+ * Translate a path into the corresponding dentry and stream in the mounted WIM
+ * image.
+ *
+ * Returns 0 or a -errno code. @dentry_ret and @strm_ret are both optional.
+ */
+static int
+wim_pathname_to_stream(const struct wimfs_context *ctx,
+ const char *path,
+ int lookup_flags,
+ struct wim_dentry **dentry_ret,
+ struct wim_inode_stream **strm_ret)
+{
+ WIMStruct *wim = ctx->wim;
+ struct wim_dentry *dentry;
+ struct wim_inode *inode;
+ struct wim_inode_stream *strm;
+ const char *stream_name = NULL;
+ char *p = NULL;
+
+ lookup_flags |= ctx->default_lookup_flags;
+
+ if (lookup_flags & LOOKUP_FLAG_ADS_OK) {
+ stream_name = path_stream_name(path);
+ if (stream_name) {
+ p = (char *)stream_name - 1;
+ *p = '\0';
+ }
+ }
+
+ dentry = get_dentry(wim, path, WIMLIB_CASE_SENSITIVE);
+ if (p)
+ *p = ':';
+ if (!dentry)
+ return -errno;
+
+ inode = dentry->d_inode;
+
+ if (inode_resolve_streams(inode, wim->blob_table, false))
+ return -EIO;
+
+ if (!(lookup_flags & LOOKUP_FLAG_DIRECTORY_OK)
+ && inode_is_directory(inode))
+ return -EISDIR;
+
+ strm = inode_get_data_stream_tstr(inode, stream_name);
+ if (!strm) {
+ /* Force creation of an unnamed data stream */
+ if (!stream_name)
+ strm = inode_add_stream(inode, STREAM_TYPE_DATA,
+ NO_STREAM_NAME, NULL);
+ if (!strm)
+ return -errno;
+ }
+
+ if (dentry_ret)
+ *dentry_ret = dentry;
+ if (strm_ret)
+ *strm_ret = strm;
+ return 0;
+}
+
/*
* Create a new file in the mounted WIM image.
*
if (get_dentry_child_with_name(parent, basename, WIMLIB_CASE_SENSITIVE))
return -EEXIST;
- if (new_dentry_with_inode(basename, &new_dentry))
+ if (new_dentry_with_new_inode(basename, true, &new_dentry))
return -ENOMEM;
new_inode = new_dentry->d_inode;
- new_inode->i_resolved = 1;
new_inode->i_ino = wimfs_ctx->next_ino++;
new_inode->i_attributes = attributes;
dentry_add_child(parent, new_dentry);
- if (dentry_ret)
- *dentry_ret = new_dentry;
+ *dentry_ret = new_dentry;
return 0;
}
* inode.
*/
static void
-remove_dentry(struct wim_dentry *dentry,
- struct wim_lookup_table *lookup_table)
+remove_dentry(struct wim_dentry *dentry, struct blob_table *blob_table)
{
- /* Drop the reference to each stream the inode contains. */
- inode_unref_streams(dentry->d_inode, lookup_table);
+ /* Drop blob references. */
+ inode_unref_blobs(dentry->d_inode, blob_table);
/* Unlink the dentry from the image's dentry tree. */
unlink_dentry(dentry);
/*
* Retrieve standard UNIX metadata ('struct stat') for a WIM inode.
*
- * @lte specifies the stream of the inode that is being queried. We mostly
- * return the same information for all streams, but st_size and st_blocks may be
- * different for different streams.
+ * @blob is the blob descriptor for the stream of the inode that is being
+ * queried, or NULL. We mostly return the same information for all streams, but
+ * st_size and st_blocks may be different for different streams.
*
* This always returns 0.
*/
static int
inode_to_stbuf(const struct wim_inode *inode,
- const struct wim_lookup_table_entry *lte,
- struct stat *stbuf)
+ const struct blob_descriptor *blob, struct stat *stbuf)
{
const struct wimfs_context *ctx = wimfs_get_context();
struct wimlib_unix_data unix_data;
}
stbuf->st_ino = inode->i_ino;
stbuf->st_nlink = inode->i_nlink;
- if (lte)
- stbuf->st_size = lte->size;
+ if (blob)
+ stbuf->st_size = blob->size;
#ifdef HAVE_STAT_NANOSECOND_PRECISION
stbuf->st_atim = wim_timestamp_to_timespec(inode->i_last_access_time);
stbuf->st_mtim = wim_timestamp_to_timespec(inode->i_last_write_time);
stbuf->st_ctim = stbuf->st_mtim;
#else
- stbuf->st_atime = wim_timestamp_to_unix(inode->i_last_access_time);
- stbuf->st_mtime = wim_timestamp_to_unix(inode->i_last_write_time);
+ stbuf->st_atime = wim_timestamp_to_time_t(inode->i_last_access_time);
+ stbuf->st_mtime = wim_timestamp_to_time_t(inode->i_last_write_time);
stbuf->st_ctime = stbuf->st_mtime;
#endif
- stbuf->st_blocks = (stbuf->st_size + 511) / 512;
+ stbuf->st_blocks = DIV_ROUND_UP(stbuf->st_size, 512);
return 0;
}
static void
touch_inode(struct wim_inode *inode)
{
- u64 now = get_wim_timestamp();
+ u64 now = now_as_wim_timestamp();
inode->i_last_access_time = now;
inode->i_last_write_time = now;
}
static void
touch_parent(struct wim_dentry *dentry)
{
- touch_inode(dentry->parent->d_inode);
+ touch_inode(dentry->d_parent->d_inode);
}
/*
}
/*
- * Extract a WIM resource to the staging directory.
- * This is necessary if a stream using the resource is being opened for writing.
+ * Extract a blob to the staging directory. This is necessary when a stream
+ * using the blob is being opened for writing and the blob has not already been
+ * extracted to the staging directory.
*
* @inode
* The inode containing the stream being opened for writing.
- *
- * @stream_idx
- * The index of the stream in @inode being opened for writing.
- *
- * @lte_ptr
- * *lte_ptr is the lookup table entry for the stream being extracted, or
- * NULL if the stream does not have a lookup table entry (which is possible
- * if the stream is empty). On success, *lte_ptr will be set to point to a
- * lookup table entry that represents the resource in its new location in a
- * staging file. This may be the same as the old entry in the case that it
- * was reused, or it may be a new entry.
- *
+ * @strm
+ * The stream being opened for writing. The blob descriptor to which the
+ * stream refers will be changed by this function.
* @size
- * Number of bytes of the stream to extract and include in the staging file
- * resource. It may be less than the actual stream length, in which case
- * only a prefix of the resource will be extracted. It may also be more
- * than the actual stream length, in which case the extra space will be
- * zero-filled.
+ * Number of bytes of the blob to extract and include in the staging file.
+ * It may be less than the actual blob length, in which case only a prefix
+ * of the blob will be extracted. It may also be more than the actual blob
+ * length, in which case the extra space will be zero-filled.
*
* Returns 0 or a -errno code.
*/
static int
-extract_resource_to_staging_dir(struct wim_inode *inode,
- u16 stream_idx,
- struct wim_lookup_table_entry **lte_ptr,
- off_t size,
- const struct wimfs_context *ctx)
-{
- struct wim_lookup_table_entry *old_lte;
- struct wim_lookup_table_entry *new_lte;
+extract_blob_to_staging_dir(struct wim_inode *inode,
+ struct wim_inode_stream *strm,
+ off_t size, const struct wimfs_context *ctx)
+{
+ struct blob_descriptor *old_blob;
+ struct blob_descriptor *new_blob;
char *staging_file_name;
int staging_fd;
off_t extract_size;
int result;
- u32 stream_id;
int ret;
- old_lte = *lte_ptr;
+ old_blob = stream_blob_resolved(strm);
/* Create the staging file. */
staging_fd = create_staging_file(ctx, &staging_file_name);
return -errno;
/* Extract the stream to the staging file (possibly truncated). */
- if (old_lte) {
+ if (old_blob) {
struct filedes fd;
filedes_init(&fd, staging_fd);
errno = 0;
- extract_size = min(old_lte->size, size);
- result = extract_stream_to_fd(old_lte, &fd, extract_size);
+ extract_size = min(old_blob->size, size);
+ result = extract_blob_to_fd(old_blob, &fd, extract_size);
} else {
extract_size = 0;
result = 0;
/* If an error occurred, unlink the staging file. */
if (unlikely(result)) {
- /* extract_stream_to_fd() should set errno, but if it didn't,
+ /* extract_blob_to_fd() should set errno, but if it didn't,
* set a default value. */
ret = errno ? -errno : -EIO;
goto out_delete_staging_file;
}
- /* Now deal with the lookup table entries. We may be able to re-use the
- * existing entry, but we may have to create a new one instead. */
+ /* Create a blob descriptor for the staging file. */
+ new_blob = new_blob_descriptor();
+ if (unlikely(!new_blob)) {
+ ret = -ENOMEM;
+ goto out_delete_staging_file;
+ }
- stream_id = inode_stream_idx_to_id(inode, stream_idx);
+ /* There may already be open file descriptors to this stream if it's
+ * previously been opened read-only, but just now we're opening it
+ * read-write. Identify those file descriptors, update them to use the
+ * new blob descriptor, and open staging file descriptors for them. */
+ for (u16 i = 0, j = 0; j < inode->i_num_opened_fds; i++) {
+ struct wimfs_fd *fd;
+ int raw_fd;
- if (old_lte && inode->i_nlink == old_lte->refcnt) {
- /* The reference count of the existing lookup table entry is the
- * same as the link count of the inode that contains the stream
- * we're opening. Therefore, all the references to the lookup
- * table entry correspond to the stream we're trying to extract,
- * so the lookup table entry can be re-used. */
- lookup_table_unlink(ctx->wim->lookup_table, old_lte);
- lte_put_resource(old_lte);
- new_lte = old_lte;
- } else {
- /* We need to split the old lookup table entry because it also
- * has other references. Or, there was no old lookup table
- * entry, so we need to create a new one anyway. */
+ fd = inode->i_fds[i];
+ if (!fd)
+ continue;
- new_lte = new_lookup_table_entry();
- if (unlikely(!new_lte)) {
- ret = -ENOMEM;
- goto out_delete_staging_file;
- }
+ j++;
- /* There may already be open file descriptors to this stream if
- * it's previously been opened read-only, but just now we're
- * opening it read-write. Identify those file descriptors and
- * change their lookup table entry pointers to point to the new
- * lookup table entry, and open staging file descriptors for
- * them.
- *
- * At the same time, we need to count the number of these opened
- * file descriptors to the new lookup table entry. If there's
- * an old lookup table entry, this number needs to be subtracted
- * from the fd's opened to the old entry. */
- for (u16 i = 0, j = 0; j < inode->i_num_opened_fds; i++) {
- struct wimfs_fd *fd;
- int raw_fd;
-
- fd = inode->i_fds[i];
- if (!fd)
- continue;
-
- j++;
-
- if (fd->f_stream_id != stream_id)
- continue;
-
- /* This is a readonly fd for the same stream. */
- fd->f_lte = new_lte;
- new_lte->num_opened_fds++;
- raw_fd = openat(ctx->staging_dir_fd, staging_file_name,
- O_RDONLY | O_NOFOLLOW);
- if (unlikely(raw_fd < 0)) {
- ret = -errno;
- goto out_revert_fd_changes;
- }
- filedes_init(&fd->f_staging_fd, raw_fd);
- }
- if (old_lte) {
- old_lte->num_opened_fds -= new_lte->num_opened_fds;
- old_lte->refcnt -= inode->i_nlink;
+ if (fd->f_stream_id != strm->stream_id)
+ continue;
+
+ /* This is a readonly fd for the same stream. */
+ fd->f_blob = new_blob;
+ new_blob->num_opened_fds++;
+ raw_fd = openat(ctx->staging_dir_fd, staging_file_name,
+ O_RDONLY | O_NOFOLLOW);
+ if (unlikely(raw_fd < 0)) {
+ ret = -errno;
+ goto out_revert_fd_changes;
}
+ filedes_init(&fd->f_staging_fd, raw_fd);
}
- new_lte->refcnt = inode->i_nlink;
- new_lte->resource_location = RESOURCE_IN_STAGING_FILE;
- new_lte->staging_file_name = staging_file_name;
- new_lte->staging_dir_fd = ctx->staging_dir_fd;
- new_lte->size = size;
+ /* Remove the appropriate count of file descriptors and stream
+ * references from the old blob. */
+ if (old_blob) {
+ old_blob->num_opened_fds -= new_blob->num_opened_fds;
+ for (u32 i = 0; i < inode->i_nlink; i++)
+ blob_decrement_refcnt(old_blob, ctx->wim->blob_table);
+ }
- add_unhashed_stream(new_lte, inode, stream_id,
- &wim_get_current_image_metadata(ctx->wim)->unhashed_streams);
- if (stream_idx == 0)
- inode->i_lte = new_lte;
- else
- inode->i_ads_entries[stream_idx - 1].lte = new_lte;
- *lte_ptr = new_lte;
+ new_blob->refcnt = inode->i_nlink;
+ new_blob->blob_location = BLOB_IN_STAGING_FILE;
+ new_blob->staging_file_name = staging_file_name;
+ new_blob->staging_dir_fd = ctx->staging_dir_fd;
+ new_blob->size = size;
+
+ prepare_unhashed_blob(new_blob, inode, strm->stream_id,
+ &wim_get_current_image_metadata(ctx->wim)->unhashed_blobs);
+ stream_set_blob(strm, new_blob);
return 0;
out_revert_fd_changes:
- for (u16 i = 0; new_lte->num_opened_fds; i++) {
+ for (u16 i = 0; new_blob->num_opened_fds; i++) {
struct wimfs_fd *fd = inode->i_fds[i];
- if (fd && fd->f_stream_id == stream_id) {
- fd->f_lte = old_lte;
+ if (fd && fd->f_stream_id == strm->stream_id) {
+ fd->f_blob = old_blob;
if (filedes_valid(&fd->f_staging_fd)) {
filedes_close(&fd->f_staging_fd);
filedes_invalidate(&fd->f_staging_fd);
}
- new_lte->num_opened_fds--;
+ new_blob->num_opened_fds--;
}
}
- free_lookup_table_entry(new_lte);
+ free_blob_descriptor(new_blob);
out_delete_staging_file:
unlinkat(ctx->staging_dir_fd, staging_file_name, 0);
FREE(staging_file_name);
return ret;
}
-/* Deletes the staging directory, undoing the effects of a succesful call to
+/* Deletes the staging directory, undoing the effects of a successful call to
* make_staging_dir(). */
static void
delete_staging_dir(struct wimfs_context *ctx)
close(ctx->parent_dir_fd);
}
+/* Number the inodes in the mounted image sequentially. */
static void
reassign_inode_numbers(struct wimfs_context *ctx)
{
static void
release_extra_refcnts(struct wimfs_context *ctx)
{
- struct list_head *list = &ctx->orig_stream_list;
- struct wim_lookup_table *lookup_table = ctx->wim->lookup_table;
- struct wim_lookup_table_entry *lte, *tmp;
+ struct list_head *list = &ctx->orig_blob_list;
+ struct blob_table *blob_table = ctx->wim->blob_table;
+ struct blob_descriptor *blob, *tmp;
- list_for_each_entry_safe(lte, tmp, list, orig_stream_list) {
- u32 n = lte->out_refcnt;
+ list_for_each_entry_safe(blob, tmp, list, orig_blob_list) {
+ u32 n = blob->out_refcnt;
while (n--)
- lte_decrement_refcnt(lte, lookup_table);
+ blob_decrement_refcnt(blob, blob_table);
}
}
+/* Delete the 'struct blob_descriptor' for any stream that was modified
+ * or created in the read-write mounted image and had a final size of 0. */
static void
-delete_empty_streams(struct wimfs_context *ctx)
+delete_empty_blobs(struct wimfs_context *ctx)
{
- struct wim_lookup_table_entry *lte, *tmp;
+ struct blob_descriptor *blob, *tmp;
struct wim_image_metadata *imd;
imd = wim_get_current_image_metadata(ctx->wim);
- image_for_each_unhashed_stream_safe(lte, tmp, imd) {
- if (!lte->size) {
- *retrieve_lte_pointer(lte) = NULL;
- list_del(<e->unhashed_list);
- free_lookup_table_entry(lte);
- }
- }
+ image_for_each_unhashed_blob_safe(blob, tmp, imd) {
+ if (!blob->size) {
+ *retrieve_pointer_to_unhashed_blob(blob) = NULL;
+ list_del(&blob->unhashed_list);
+ free_blob_descriptor(blob);
+ }
+ }
}
+/* Close all file descriptors open to the specified inode.
+ *
+ * Note: closing the last file descriptor might free the inode. */
static void
inode_close_fds(struct wim_inode *inode)
{
}
}
+/* Close all file descriptors open to the mounted image. */
static void
close_all_fds(struct wimfs_context *ctx)
{
int idx = wim->current_image - 1;
struct wim_image_metadata *imd = wim->image_metadata[idx];
struct wim_image_metadata *replace_imd;
- struct wim_lookup_table_entry *new_lte;
+ struct blob_descriptor *new_blob;
int ret;
/* Create 'replace_imd' structure to use for the reset original,
if (!replace_imd)
goto err;
- /* Create new stream reference for the modified image's metadata
+ /* Create new blob descriptor for the modified image's metadata
* resource, which doesn't exist yet. */
ret = WIMLIB_ERR_NOMEM;
- new_lte = new_lookup_table_entry();
- if (!new_lte)
+ new_blob = new_blob_descriptor();
+ if (!new_blob)
goto err_put_replace_imd;
- new_lte->flags = WIM_RESHDR_FLAG_METADATA;
- new_lte->unhashed = 1;
+ new_blob->flags = WIM_RESHDR_FLAG_METADATA;
+ new_blob->unhashed = 1;
/* Make the image being moved available at a new index. Increments the
* WIM's image count, but does not increment the reference count of the
* 'struct image_metadata'. */
ret = append_image_metadata(wim, imd);
if (ret)
- goto err_free_new_lte;
+ goto err_free_new_blob;
- ret = xml_add_image(wim, T(""));
+ ret = xml_add_image(wim, "");
if (ret)
goto err_undo_append;
- replace_imd->metadata_lte = imd->metadata_lte;
- imd->metadata_lte = new_lte;
+ replace_imd->metadata_blob = imd->metadata_blob;
+ imd->metadata_blob = new_blob;
wim->image_metadata[idx] = replace_imd;
wim->current_image = wim->hdr.image_count;
return 0;
err_undo_append:
wim->hdr.image_count--;
-err_free_new_lte:
- free_lookup_table_entry(new_lte);
+err_free_new_blob:
+ free_blob_descriptor(new_blob);
err_put_replace_imd:
put_image_metadata(replace_imd, NULL);
err:
} else {
release_extra_refcnts(ctx);
}
- INIT_LIST_HEAD(&ctx->orig_stream_list);
- delete_empty_streams(ctx);
+ INIT_LIST_HEAD(&ctx->orig_blob_list);
+ delete_empty_blobs(ctx);
xml_update_image_info(ctx->wim, ctx->wim->current_image);
write_flags = 0;
+
if (unmount_flags & WIMLIB_UNMOUNT_FLAG_CHECK_INTEGRITY)
write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
+
if (unmount_flags & WIMLIB_UNMOUNT_FLAG_REBUILD)
write_flags |= WIMLIB_WRITE_FLAG_REBUILD;
+
if (unmount_flags & WIMLIB_UNMOUNT_FLAG_RECOMPRESS)
write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
+
return wimlib_overwrite(ctx->wim, write_flags, 0);
}
+/* In the case of an allow_other mount, only the mount owner and root are
+ * allowed to unmount the filesystem. */
+static bool
+may_unmount_wimfs(void)
+{
+ const struct fuse_context *fuse_ctx = fuse_get_context();
+ const struct wimfs_context *wimfs_ctx = WIMFS_CTX(fuse_ctx);
+
+ return (fuse_ctx->uid == wimfs_ctx->owner_uid ||
+ fuse_ctx->uid == 0);
+}
+
+/* Unmount the mounted image, called from the daemon process. */
static int
-unmount_wimfs(const struct wimfs_unmount_info *info)
+unmount_wimfs(void)
{
struct fuse_context *fuse_ctx = fuse_get_context();
struct wimfs_context *wimfs_ctx = WIMFS_CTX(fuse_ctx);
+ const struct wimfs_unmount_info *info = &wimfs_ctx->unmount_info;
int unmount_flags = info->unmount_flags;
mqd_t mq = (mqd_t)-1;
- int status;
-
- if (fuse_ctx->uid != wimfs_ctx->owner_uid &&
- fuse_ctx->uid != 0)
- return -EPERM;
-
- if (info->mq_name[0]) {
- mq = mq_open(info->mq_name, O_WRONLY | O_NONBLOCK);
- if (mq == (mqd_t)-1)
- return -errno;
- }
+ int ret;
/* Ignore COMMIT if the image is mounted read-only. */
if (!(wimfs_ctx->mount_flags & WIMLIB_MOUNT_FLAG_READWRITE))
unmount_flags &= ~WIMLIB_UNMOUNT_FLAG_COMMIT;
+ if (unmount_flags & WIMLIB_UNMOUNT_FLAG_SEND_PROGRESS) {
+ mq = mq_open(info->mq_name, O_WRONLY | O_NONBLOCK);
+ if (mq == (mqd_t)-1) {
+ ret = WIMLIB_ERR_MQUEUE;
+ goto out;
+ }
+ }
+
if (wimfs_ctx->num_open_fds) {
+
+ /* There are still open file descriptors to the image. */
+
+ /* With COMMIT, refuse to unmount unless FORCE is also
+ * specified. */
if ((unmount_flags & (WIMLIB_UNMOUNT_FLAG_COMMIT |
WIMLIB_UNMOUNT_FLAG_FORCE))
== WIMLIB_UNMOUNT_FLAG_COMMIT)
{
- status = WIMLIB_ERR_MOUNTED_IMAGE_IS_BUSY;
- goto out_send_status;
+ ret = WIMLIB_ERR_MOUNTED_IMAGE_IS_BUSY;
+ goto out;
}
+
+ /* Force-close all file descriptors. */
close_all_fds(wimfs_ctx);
}
if (unmount_flags & WIMLIB_UNMOUNT_FLAG_COMMIT)
- status = commit_image(wimfs_ctx, unmount_flags, mq);
+ ret = commit_image(wimfs_ctx, unmount_flags, mq);
else
- status = 0;
- fuse_exit(fuse_ctx->fuse);
-out_send_status:
- if (mq != (mqd_t)-1) {
- mq_send(mq, (const char *)&status, sizeof(int), 1);
- mq_close(mq);
+ ret = 0; /* Read-only mount, or discarding changes to
+ a read-write mount */
+
+out:
+ /* Leave the image mounted if commit failed, unless this is a
+ * forced unmount. The user can retry without COMMIT if they
+ * want. */
+ if (!ret || (unmount_flags & WIMLIB_UNMOUNT_FLAG_FORCE)) {
+ unlock_wim_for_append(wimfs_ctx->wim);
+ fuse_exit(fuse_ctx->fuse);
}
- return 0;
+ if (mq != (mqd_t)-1)
+ mq_close(mq);
+ return ret;
}
static int
wimfs_fgetattr(const char *path, struct stat *stbuf, struct fuse_file_info *fi)
{
struct wimfs_fd *fd = WIMFS_FD(fi);
- return inode_to_stbuf(fd->f_inode, fd->f_lte, stbuf);
+ return inode_to_stbuf(fd->f_inode, fd->f_blob, stbuf);
}
static int
if (ftruncate(fd->f_staging_fd.fd, size))
return -errno;
touch_inode(fd->f_inode);
- fd->f_lte->size = size;
+ fd->f_blob->size = size;
return 0;
}
{
const struct wimfs_context *ctx = wimfs_get_context();
struct wim_dentry *dentry;
- struct wim_lookup_table_entry *lte;
+ struct wim_inode_stream *strm;
int ret;
- ret = wim_pathname_to_stream(ctx->wim, path,
- get_lookup_flags(ctx) |
- LOOKUP_FLAG_DIRECTORY_OK,
- &dentry, <e, NULL);
+ ret = wim_pathname_to_stream(ctx, path, LOOKUP_FLAG_DIRECTORY_OK,
+ &dentry, &strm);
if (ret)
return ret;
- return inode_to_stbuf(dentry->d_inode, lte, stbuf);
+
+ return inode_to_stbuf(dentry->d_inode,
+ stream_blob_resolved(strm), stbuf);
}
static int
copy_xattr(char *dest, size_t destsize, const void *src, size_t srcsize)
{
- if (!destsize)
- return srcsize;
- if (destsize < srcsize)
- return -ERANGE;
- memcpy(dest, src, srcsize);
+ if (destsize) {
+ if (destsize < srcsize)
+ return -ERANGE;
+ memcpy(dest, src, srcsize);
+ }
return srcsize;
}
wimfs_getxattr(const char *path, const char *name, char *value,
size_t size)
{
- struct fuse_context *fuse_ctx = fuse_get_context();
- const struct wimfs_context *ctx = WIMFS_CTX(fuse_ctx);
+ const struct wimfs_context *ctx = wimfs_get_context();
struct wim_inode *inode;
- struct wim_ads_entry *ads_entry;
- struct wim_lookup_table_entry *lte;
+ struct wim_inode_stream *strm;
+ struct blob_descriptor *blob;
if (!strncmp(name, "wimfs.", 6)) {
/* Handle some magical extended attributes. These really should
&ctx->mount_flags, sizeof(int));
}
if (!strcmp(name, "unmount")) {
- struct wimfs_unmount_info info;
- memset(&info, 0, sizeof(info));
- return unmount_wimfs(&info);
+ if (!may_unmount_wimfs())
+ return -EPERM;
+ if (size) {
+ int status;
+
+ if (size < sizeof(int))
+ return -ERANGE;
+ status = unmount_wimfs();
+ memcpy(value, &status, sizeof(int));
+ }
+ return sizeof(int);
}
return -ENOATTR;
}
return -ENOATTR;
name += 5;
+ if (!*name)
+ return -ENOATTR;
+
/* Querying a named data stream */
inode = wim_pathname_to_inode(ctx->wim, path);
if (!inode)
return -errno;
- ads_entry = inode_get_ads_entry(inode, name);
- if (!ads_entry)
+ strm = inode_get_data_stream_tstr(inode, name);
+ if (!strm)
return (errno == ENOENT) ? -ENOATTR : -errno;
- lte = ads_entry->lte;
- if (!lte)
+ blob = stream_blob_resolved(strm);
+ if (!blob)
return 0;
- if (unlikely(lte->size > INT_MAX))
+ if (unlikely(blob->size > INT_MAX))
return -EFBIG;
if (size) {
- if (lte->size > size)
+ if (size < blob->size)
return -ERANGE;
- if (read_full_stream_into_buf(lte, value))
- return -errno;
+ if (read_full_blob_into_buf(blob, value))
+ return errno ? -errno : -EIO;
}
- return lte->size;
+ return blob->size;
}
static int
if (get_dentry_child_with_name(dir, new_name, WIMLIB_CASE_SENSITIVE))
return -EEXIST;
- if (new_dentry(new_name, &new_alias))
+ if (new_dentry_with_existing_inode(new_name, inode, &new_alias))
return -ENOMEM;
- new_alias->d_inode = inode;
- inode_add_dentry(new_alias, inode);
dentry_add_child(dir, new_alias);
touch_inode(dir->d_inode);
- inode->i_nlink++;
- inode_ref_streams(inode);
return 0;
}
if (!inode)
return -errno;
- for (u16 i = 0; i < inode->i_num_ads; i++) {
- const struct wim_ads_entry *entry;
+ for (unsigned i = 0; i < inode->i_num_streams; i++) {
+ const struct wim_inode_stream *strm;
char *stream_name_mbs;
size_t stream_name_mbs_nbytes;
- entry = &inode->i_ads_entries[i];
+ strm = &inode->i_streams[i];
- if (!entry->stream_name_nbytes)
+ if (!stream_is_named_data_stream(strm))
continue;
- if (utf16le_to_tstr(entry->stream_name,
- entry->stream_name_nbytes,
+ if (utf16le_to_tstr(strm->stream_name,
+ utf16le_len_bytes(strm->stream_name),
&stream_name_mbs,
&stream_name_mbs_nbytes))
return -errno;
if ((wimfs_ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS)
&& (stream_name = path_stream_name(path)))
{
- struct wim_ads_entry *old_entry;
- struct wim_ads_entry *new_entry;
struct wim_inode *inode;
+ struct wim_inode_stream *existing_strm;
+ struct wim_inode_stream *new_strm;
char *p;
+ const utf16lechar *uname;
/* Create a named data stream. */
if (!inode)
return -errno;
- old_entry = inode_get_ads_entry(inode, stream_name);
- if (old_entry)
- return -EEXIST;
- if (errno != ENOENT)
+ if (tstr_get_utf16le(stream_name, &uname))
return -errno;
- new_entry = inode_add_ads(inode, stream_name);
- if (!new_entry)
+ existing_strm = inode_get_stream(inode, STREAM_TYPE_DATA, uname);
+ if (existing_strm) {
+ tstr_put_utf16le(uname);
+ return -EEXIST;
+ }
+
+ new_strm = inode_add_stream(inode, STREAM_TYPE_DATA, uname, NULL);
+
+ tstr_put_utf16le(uname);
+
+ if (!new_strm)
return -errno;
return 0;
} else {
struct wimfs_context *ctx = wimfs_get_context();
struct wim_dentry *dentry;
struct wim_inode *inode;
- struct wim_lookup_table_entry *lte;
- u16 stream_idx;
+ struct wim_inode_stream *strm;
+ struct blob_descriptor *blob;
struct wimfs_fd *fd;
int ret;
- ret = wim_pathname_to_stream(ctx->wim, path, get_lookup_flags(ctx),
- &dentry, <e, &stream_idx);
+ ret = wim_pathname_to_stream(ctx, path, 0, &dentry, &strm);
if (ret)
return ret;
inode = dentry->d_inode;
+ blob = stream_blob_resolved(strm);
- /* 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
- * open a native file descriptor for the corresponding file. Otherwise,
- * 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. */
+ /* The data of the file being opened may be in the staging directory
+ * (read-write mounts only) or in the WIM. If it's in the staging
+ * directory, we need to open a native file descriptor for the
+ * corresponding file. Otherwise, we can read the file data directly
+ * from the WIM file if we are opening it read-only, but we need to
+ * extract the data to the staging directory if we are opening it
+ * writable. */
if (flags_writable(fi->flags) &&
- (!lte || lte->resource_location != RESOURCE_IN_STAGING_FILE)) {
- ret = extract_resource_to_staging_dir(inode,
- stream_idx,
- <e,
- lte ? lte->size : 0,
- ctx);
+ (!blob || blob->blob_location != BLOB_IN_STAGING_FILE)) {
+ ret = extract_blob_to_staging_dir(inode,
+ strm,
+ blob ? blob->size : 0,
+ ctx);
if (ret)
return ret;
+ blob = stream_blob_resolved(strm);
}
- ret = alloc_wimfs_fd(inode, inode_stream_idx_to_id(inode, stream_idx),
- lte, &fd);
+ ret = alloc_wimfs_fd(inode, strm, &fd);
if (ret)
return ret;
- if (lte && lte->resource_location == RESOURCE_IN_STAGING_FILE) {
+ if (blob && blob->blob_location == BLOB_IN_STAGING_FILE) {
int raw_fd;
- raw_fd = openat(lte->staging_dir_fd, lte->staging_file_name,
+ raw_fd = openat(blob->staging_dir_fd, blob->staging_file_name,
(fi->flags & O_ACCMODE) | O_NOFOLLOW);
if (raw_fd < 0) {
close_wimfs_fd(fd);
{
WIMStruct *wim = wimfs_get_WIMStruct();
struct wim_inode *inode;
+ struct wim_inode_stream *strm;
struct wimfs_fd *fd;
int ret;
return -errno;
if (!inode_is_directory(inode))
return -ENOTDIR;
- ret = alloc_wimfs_fd(inode, 0, NULL, &fd);
+ strm = inode_get_unnamed_stream(inode, STREAM_TYPE_DATA);
+ if (!strm)
+ return -ENOTDIR;
+ ret = alloc_wimfs_fd(inode, strm, &fd);
if (ret)
return ret;
fi->fh = (uintptr_t)fd;
off_t offset, struct fuse_file_info *fi)
{
struct wimfs_fd *fd = WIMFS_FD(fi);
- const struct wim_lookup_table_entry *lte;
+ const struct blob_descriptor *blob;
ssize_t ret;
- lte = fd->f_lte;
- if (!lte)
+ blob = fd->f_blob;
+ if (!blob)
return 0;
- if (offset >= lte->size)
+ if (offset >= blob->size)
return 0;
- if (size > lte->size - offset)
- size = lte->size - offset;
+ if (size > blob->size - offset)
+ size = blob->size - offset;
if (!size)
return 0;
- switch (lte->resource_location) {
- case RESOURCE_IN_WIM:
- if (read_partial_wim_stream_into_buf(lte, size, offset, buf))
- ret = -errno;
+ switch (blob->blob_location) {
+ case BLOB_IN_WIM:
+ if (read_partial_wim_blob_into_buf(blob, size, offset, buf))
+ ret = errno ? -errno : -EIO;
else
ret = size;
break;
- case RESOURCE_IN_STAGING_FILE:
+ case BLOB_IN_STAGING_FILE:
ret = raw_pread(&fd->f_staging_fd, buf, size, offset);
if (ret < 0)
ret = -errno;
break;
- case RESOURCE_IN_ATTACHED_BUFFER:
- memcpy(buf, lte->attached_buffer + offset, size);
+ case BLOB_IN_ATTACHED_BUFFER:
+ memcpy(buf, blob->attached_buffer + offset, size);
ret = size;
break;
default:
{
struct wimfs_context *ctx = wimfs_get_context();
struct wim_inode *inode;
- struct wim_ads_entry *ads_entry;
+ struct wim_inode_stream *strm;
if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
return -ENOTSUP;
return -ENOATTR;
name += 5;
+ if (!*name)
+ return -ENOATTR;
+
/* Removing a named data stream. */
inode = wim_pathname_to_inode(ctx->wim, path);
if (!inode)
return -errno;
- ads_entry = inode_get_ads_entry(inode, name);
- if (!ads_entry)
+ strm = inode_get_data_stream_tstr(inode, name);
+ if (!strm)
return (errno == ENOENT) ? -ENOATTR : -errno;
- inode_remove_ads(inode, ads_entry, ctx->wim->lookup_table);
+ inode_remove_stream(inode, strm, ctx->wim->blob_table);
return 0;
}
return -ENOTEMPTY;
touch_parent(dentry);
- remove_dentry(dentry, wim->lookup_table);
+ remove_dentry(dentry, wim->blob_table);
return 0;
}
{
struct wimfs_context *ctx = wimfs_get_context();
struct wim_inode *inode;
- struct wim_ads_entry *existing_entry;
+ struct wim_inode_stream *existing_strm;
+ const utf16lechar *uname;
+ int ret;
if (!strncmp(name, "wimfs.", 6)) {
/* Handle some magical extended attributes. These really should
* be ioctls, but directory ioctls aren't supported until
- * libfuse 2.9, and even then they are broken. */
+ * libfuse 2.9, and even then they are broken. [Fixed by
+ * libfuse commit e3b7d4c278a26520be63d99d6ea84b26906fe73d] */
name += 6;
- if (!strcmp(name, "unmount")) {
+ if (!strcmp(name, "unmount_info")) {
+ if (!may_unmount_wimfs())
+ return -EPERM;
if (size < sizeof(struct wimfs_unmount_info))
return -EINVAL;
- return unmount_wimfs((const void *)value);
+ memcpy(&ctx->unmount_info, value,
+ sizeof(struct wimfs_unmount_info));
+ return 0;
}
return -ENOATTR;
}
return -ENOATTR;
name += 5;
+ if (!*name)
+ return -ENOATTR;
+
/* Setting the contents of a named data stream. */
inode = wim_pathname_to_inode(ctx->wim, path);
if (!inode)
return -errno;
- existing_entry = inode_get_ads_entry(inode, name);
- if (existing_entry) {
+ ret = tstr_get_utf16le(name, &uname);
+ if (ret)
+ return -errno;
+
+ existing_strm = inode_get_stream(inode, STREAM_TYPE_DATA, uname);
+ if (existing_strm) {
+ ret = -EEXIST;
if (flags & XATTR_CREATE)
- return -EEXIST;
+ goto out_put_uname;
} else {
- if (errno != ENOENT)
- return -errno;
+ ret = -ENOATTR;
if (flags & XATTR_REPLACE)
- return -ENOATTR;
+ goto out_put_uname;
}
- if (!inode_add_ads_with_data(inode, name, value,
- size, ctx->wim->lookup_table))
- return -errno;
- if (existing_entry)
- inode_remove_ads(inode, existing_entry, ctx->wim->lookup_table);
- return 0;
+ if (!inode_add_stream_with_data(inode, STREAM_TYPE_DATA, uname,
+ value, size, ctx->wim->blob_table))
+ {
+ ret = -errno;
+ goto out_put_uname;
+ }
+ if (existing_strm)
+ inode_remove_stream(inode, existing_strm, ctx->wim->blob_table);
+ ret = 0;
+out_put_uname:
+ tstr_put_utf16le(uname);
+ return ret;
}
static int
return ret;
dentry->d_inode->i_reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
ret = wim_inode_set_symlink(dentry->d_inode, to,
- wimfs_ctx->wim->lookup_table);
+ wimfs_ctx->wim->blob_table);
if (ret) {
- remove_dentry(dentry, wimfs_ctx->wim->lookup_table);
+ remove_dentry(dentry, wimfs_ctx->wim->blob_table);
if (ret == WIMLIB_ERR_NOMEM)
ret = -ENOMEM;
else
{
const struct wimfs_context *ctx = wimfs_get_context();
struct wim_dentry *dentry;
- struct wim_lookup_table_entry *lte;
- u16 stream_idx;
+ struct wim_inode_stream *strm;
+ struct blob_descriptor *blob;
int ret;
int fd;
- ret = wim_pathname_to_stream(ctx->wim, path, get_lookup_flags(ctx),
- &dentry, <e, &stream_idx);
-
+ ret = wim_pathname_to_stream(ctx, path, 0, &dentry, &strm);
if (ret)
return ret;
- if (!lte && !size)
+ blob = stream_blob_resolved(strm);
+
+ if (!blob && !size)
return 0;
- if (!lte || lte->resource_location != RESOURCE_IN_STAGING_FILE) {
- return extract_resource_to_staging_dir(dentry->d_inode,
- stream_idx, <e,
- size, ctx);
+ if (!blob || blob->blob_location != BLOB_IN_STAGING_FILE) {
+ return extract_blob_to_staging_dir(dentry->d_inode,
+ strm, size, ctx);
}
/* Truncate the staging file. */
- fd = openat(lte->staging_dir_fd, lte->staging_file_name,
+ fd = openat(blob->staging_dir_fd, blob->staging_file_name,
O_WRONLY | O_NOFOLLOW);
if (fd < 0)
return -errno;
ret = ftruncate(fd, size);
if (close(fd) || ret)
return -errno;
- lte->size = size;
+ blob->size = size;
+ touch_inode(dentry->d_inode);
return 0;
}
{
const struct wimfs_context *ctx = wimfs_get_context();
struct wim_dentry *dentry;
- u16 stream_idx;
+ struct wim_inode_stream *strm;
int ret;
- ret = wim_pathname_to_stream(ctx->wim, path, get_lookup_flags(ctx),
- &dentry, NULL, &stream_idx);
-
+ ret = wim_pathname_to_stream(ctx, path, 0, &dentry, &strm);
if (ret)
return ret;
- if (inode_stream_name_nbytes(dentry->d_inode, stream_idx) == 0) {
- touch_parent(dentry);
- remove_dentry(dentry, ctx->wim->lookup_table);
+ if (stream_is_named(strm)) {
+ inode_remove_stream(dentry->d_inode, strm,
+ ctx->wim->blob_table);
} else {
- inode_remove_ads(dentry->d_inode,
- &dentry->d_inode->i_ads_entries[stream_idx - 1],
- ctx->wim->lookup_table);
+ touch_parent(dentry);
+ remove_dentry(dentry, ctx->wim->blob_table);
}
return 0;
}
if (tv[0].tv_nsec != UTIME_OMIT) {
if (tv[0].tv_nsec == UTIME_NOW)
- inode->i_last_access_time = get_wim_timestamp();
+ inode->i_last_access_time = now_as_wim_timestamp();
else
- inode->i_last_access_time = timespec_to_wim_timestamp(tv[0]);
+ inode->i_last_access_time = timespec_to_wim_timestamp(&tv[0]);
}
if (tv[1].tv_nsec != UTIME_OMIT) {
if (tv[1].tv_nsec == UTIME_NOW)
- inode->i_last_write_time = get_wim_timestamp();
+ inode->i_last_write_time = now_as_wim_timestamp();
else
- inode->i_last_write_time = timespec_to_wim_timestamp(tv[1]);
+ inode->i_last_write_time = timespec_to_wim_timestamp(&tv[1]);
}
return 0;
}
if (!inode)
return -errno;
- inode->i_last_access_time = unix_timestamp_to_wim(times->actime);
- inode->i_last_write_time = unix_timestamp_to_wim(times->modtime);
+ inode->i_last_access_time = time_t_to_wim_timestamp(times->actime);
+ inode->i_last_write_time = time_t_to_wim_timestamp(times->modtime);
return 0;
}
#endif /* !HAVE_UTIMENSAT */
if (ret < 0)
return -errno;
- if (offset + size > fd->f_lte->size)
- fd->f_lte->size = offset + size;
+ if (offset + size > fd->f_blob->size)
+ fd->f_blob->size = offset + size;
touch_inode(fd->f_inode);
return ret;
/* For read-write mount, check for write access to the WIM. */
if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
- ret = can_delete_from_wim(wim);
+ if (!wim->filename)
+ return WIMLIB_ERR_NO_FILENAME;
+ ret = can_modify_wim(wim);
if (ret)
return ret;
}
return WIMLIB_ERR_INVALID_PARAM;
}
- ret = lock_wim_for_append(wim, wim->in_fd.fd);
- if (ret)
- return ret;
+ if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
+ ret = lock_wim_for_append(wim);
+ if (ret)
+ return ret;
+ }
/* If the user did not specify an interface for accessing named
* data streams, use the default (extended attributes). */
ctx.owner_uid = getuid();
ctx.owner_gid = getgid();
- /* Add each stream referenced by files in the image to a list and
- * preemptively double the number of references to each. The latter is
- * done to allow implementing the WIMLIB_UNMOUNT_FLAG_NEW_IMAGE
- * semantics. */
- INIT_LIST_HEAD(&ctx.orig_stream_list);
+ /* Add each blob referenced by files in the image to a list and
+ * preemptively double the number of references to each. This is done
+ * to allow implementing the WIMLIB_UNMOUNT_FLAG_NEW_IMAGE semantics.
+ */
+ INIT_LIST_HEAD(&ctx.orig_blob_list);
if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
unsigned i;
struct wim_inode *inode;
- struct wim_lookup_table_entry *lte;
+ struct blob_descriptor *blob;
image_for_each_inode(inode, imd) {
- for (i = 0; i <= inode->i_num_ads; i++) {
- lte = inode_stream_lte(inode, i,
- wim->lookup_table);
- if (lte)
- lte->out_refcnt = 0;
+ for (i = 0; i < inode->i_num_streams; i++) {
+ blob = stream_blob(&inode->i_streams[i],
+ wim->blob_table);
+ if (blob)
+ blob->out_refcnt = 0;
}
}
image_for_each_inode(inode, imd) {
- for (i = 0; i <= inode->i_num_ads; i++) {
- lte = inode_stream_lte(inode, i,
- wim->lookup_table);
- if (lte) {
- if (lte->out_refcnt == 0)
- list_add(<e->orig_stream_list,
- &ctx.orig_stream_list);
- lte->out_refcnt += inode->i_nlink;
- lte->refcnt += inode->i_nlink;
+ for (i = 0; i < inode->i_num_streams; i++) {
+ blob = stream_blob(&inode->i_streams[i],
+ wim->blob_table);
+ if (blob) {
+ if (blob->out_refcnt == 0)
+ list_add(&blob->orig_blob_list,
+ &ctx.orig_blob_list);
+ blob->out_refcnt += inode->i_nlink;
+ blob->refcnt += inode->i_nlink;
}
}
}
char optstring[256] =
"use_ino"
",subtype=wimfs"
- ",attr_timeout=0"
",hard_remove"
",default_permissions"
",kernel_cache"
if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)
delete_staging_dir(&ctx);
out_unlock:
- unlock_wim_for_append(wim, wim->in_fd.fd);
+ unlock_wim_for_append(wim);
return ret;
}
mqd_t mq;
wimlib_progress_func_t progfunc;
void *progctx;
- int status;
};
static void *
struct commit_progress_report report;
ssize_t ret;
- args->status = WIMLIB_ERR_NOT_A_MOUNTPOINT;
for (;;) {
ret = mq_receive(args->mq,
(char *)&report, sizeof(report), NULL);
- if (ret < 0) {
- if (errno == EINTR)
- continue;
- break;
- }
- if (ret == sizeof(int)) {
- args->status = *(int *)&report;
- break;
+ if (ret == sizeof(report)) {
+ call_progress(args->progfunc, report.msg,
+ &report.info, args->progctx);
+ } else {
+ if (ret == 0 || (ret < 0 && errno != EINTR))
+ break;
}
- if (ret < sizeof(report))
- continue;
- call_progress(args->progfunc, report.msg,
- &report.info, args->progctx);
}
return NULL;
}
}
static mqd_t
-create_message_queue(const char *name, bool have_progfunc)
+create_message_queue(const char *name)
{
- bool am_root = (getuid() == 0);
- mode_t umask_save = 0;
- mode_t mode = 0600;
+ bool am_root;
+ mode_t umask_save;
+ mode_t mode;
struct mq_attr attr;
mqd_t mq;
memset(&attr, 0, sizeof(attr));
attr.mq_maxmsg = 8;
- if (have_progfunc)
- attr.mq_msgsize = sizeof(struct commit_progress_report);
- else
- attr.mq_msgsize = sizeof(int);
+ attr.mq_msgsize = sizeof(struct commit_progress_report);
+ am_root = (geteuid() == 0);
if (am_root) {
/* Filesystem mounted as normal user with --allow-other should
* be able to send messages to root user, if they're doing the
* unmount. */
umask_save = umask(0);
mode = 0666;
+ } else {
+ mode = 0600;
}
mq = mq_open(name, O_RDWR | O_CREAT | O_EXCL, mode, &attr);
if (am_root)
return mq;
}
+/* Unmount a read-only or read-write mounted WIM image. */
+static int
+do_unmount(const char *dir)
+{
+ int status;
+ ssize_t len;
+
+ len = getxattr(dir, "wimfs.unmount", &status, sizeof(int));
+ if (len == sizeof(int))
+ return status;
+ else if (len < 0 && (errno == EACCES || errno == EPERM))
+ return WIMLIB_ERR_NOT_PERMITTED_TO_UNMOUNT;
+ else
+ return WIMLIB_ERR_NOT_A_MOUNTPOINT;
+}
+
+static int
+set_unmount_info(const char *dir, const struct wimfs_unmount_info *unmount_info)
+{
+ if (!setxattr(dir, "wimfs.unmount_info",
+ unmount_info, sizeof(struct wimfs_unmount_info), 0))
+ return 0;
+ else if (errno == EROFS)
+ return 0;
+ else if (errno == EACCES || errno == EPERM)
+ return WIMLIB_ERR_NOT_PERMITTED_TO_UNMOUNT;
+ else
+ return WIMLIB_ERR_NOT_A_MOUNTPOINT;
+}
+
+static int
+do_unmount_discard(const char *dir)
+{
+ int ret;
+ struct wimfs_unmount_info unmount_info;
+
+ memset(&unmount_info, 0, sizeof(unmount_info));
+
+ ret = set_unmount_info(dir, &unmount_info);
+ if (ret)
+ return ret;
+ return do_unmount(dir);
+}
+
/* Unmount a read-write mounted WIM image, committing the changes. */
static int
do_unmount_commit(const char *dir, int unmount_flags,
memset(&unmount_info, 0, sizeof(unmount_info));
unmount_info.unmount_flags = unmount_flags;
- generate_message_queue_name(unmount_info.mq_name);
- mq = create_message_queue(unmount_info.mq_name, progfunc != NULL);
- if (mq == (mqd_t)-1) {
- ERROR_WITH_ERRNO("Can't create POSIX message queue");
- return WIMLIB_ERR_MQUEUE;
- }
-
- /* The current thread will be stuck in setxattr() until the image is
+ /* The current thread will be stuck in getxattr() until the image is
* committed. Create a thread to handle the progress messages. */
if (progfunc) {
+ generate_message_queue_name(unmount_info.mq_name);
+
+ mq = create_message_queue(unmount_info.mq_name);
+ if (mq == (mqd_t)-1) {
+ ERROR_WITH_ERRNO("Can't create POSIX message queue");
+ return WIMLIB_ERR_MQUEUE;
+ }
args.mq = mq;
args.progfunc = progfunc;
args.progctx = progctx;
unmount_info.unmount_flags |= WIMLIB_UNMOUNT_FLAG_SEND_PROGRESS;
}
- if (!setxattr(dir, "wimfs.unmount",
- (const char *)&unmount_info, sizeof(unmount_info), 0))
- ret = 0;
- else if (errno == EACCES || errno == EPERM)
- ret = WIMLIB_ERR_NOT_PERMITTED_TO_UNMOUNT;
- else
- ret = WIMLIB_ERR_NOT_A_MOUNTPOINT;
-
+ ret = set_unmount_info(dir, &unmount_info);
+ if (!ret)
+ ret = do_unmount(dir);
if (progfunc) {
- /* Terminate the progress thread and retrieve final unmount
- * status. */
-
- int tmp = -1;
- mq_send(mq, (const char *)&tmp, sizeof(int), 1);
-
+ /* Terminate the progress thread. */
+ char empty[1];
+ mq_send(mq, empty, 0, 1);
pthread_join(commit_progress_tid, NULL);
- if (!ret && args.status != -1)
- ret = args.status;
- } else if (!ret) {
- /* Retrieve the final unmount status. */
-
- int tmp = -1;
- int len;
-
- mq_send(mq, (const char *)&tmp, sizeof(int), 1);
- len = mq_receive(mq, (char *)&tmp, sizeof(int), NULL);
-
- if (len == 4 && tmp != -1)
- ret = tmp;
- else
- ret = WIMLIB_ERR_NOT_A_MOUNTPOINT;
}
out_delete_mq:
- mq_close(mq);
- mq_unlink(unmount_info.mq_name);
+ if (progfunc) {
+ mq_close(mq);
+ mq_unlink(unmount_info.mq_name);
+ }
return ret;
}
-/* Unmount a read-only or read-write mounted WIM image, discarding any changes.
- */
-static int
-do_unmount_discard(const char *dir)
-{
- if (!getxattr(dir, "wimfs.unmount", NULL, 0))
- return 0;
- else if (errno == EACCES || errno == EPERM)
- return WIMLIB_ERR_NOT_PERMITTED_TO_UNMOUNT;
- else
- return WIMLIB_ERR_NOT_A_MOUNTPOINT;
-}
-
static int
begin_unmount(const char *dir, int unmount_flags, int *mount_flags_ret,
wimlib_progress_func_t progfunc, void *progctx)
int mount_flags;
int ret;
- wimlib_global_init(WIMLIB_INIT_FLAG_ASSUME_UTF8);
+ ret = wimlib_global_init(WIMLIB_INIT_FLAG_ASSUME_UTF8);
+ if (ret)
+ return ret;
if (unmount_flags & ~(WIMLIB_UNMOUNT_FLAG_CHECK_INTEGRITY |
WIMLIB_UNMOUNT_FLAG_COMMIT |
git://wimlib.net / wimlib / blobdiff