X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmount_image.c;h=06890dbca45cc7c2294683e041f2997a082ff400;hp=30ee82d235c3c0ad3de339b451e0235870cd4be4;hb=71d3401258fb14dcfc921f53452ba972e27e8b8b;hpb=91ba045392c18b7e12add95158cd2ab67c1505ae

diff --git a/src/mount_image.c b/src/mount_image.c
index 30ee82d2..06890dbc 100644
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * Copyright (C) 2012, 2013 Eric Biggers
+ * Copyright (C) 2012, 2013, 2014 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
@@ -341,16 +341,9 @@ create_dentry(struct fuse_context *fuse_ctx, const char *path,
 	new->d_inode->i_attributes = attributes;
 
 	if (wimfs_ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA) {
-		if (inode_set_unix_data(new->d_inode,
-					fuse_ctx->uid,
-					fuse_ctx->gid,
-					fuse_mask_mode(mode, fuse_ctx),
-					wimfs_ctx->wim->lookup_table,
-					UNIX_DATA_ALL | UNIX_DATA_CREATE))
-		{
-			free_dentry(new);
-			return -ENOMEM;
-		}
+		new->d_inode->i_unix_data.uid = fuse_ctx->uid;
+		new->d_inode->i_unix_data.gid = fuse_ctx->gid;
+		new->d_inode->i_unix_data.mode = fuse_mask_mode(mode, fuse_ctx);
 	}
 	dentry_add_child(parent, new);
 	list_add_tail(&new->d_inode->i_list, wimfs_ctx->image_inode_list);
@@ -370,44 +363,39 @@ wim_pathname_to_inode(WIMStruct *wim, const tchar *path)
 		return NULL;
 }
 
-/* Remove a dentry from a mounted WIM image; i.e. remove an alias for the
- * corresponding inode.
- *
- * 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.
- *
- * 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 corresponding
- * staging file is unlinked.
+/*
+ * Remove a dentry from a mounted WIM image; i.e. remove an alias for an inode.
  */
 static void
 remove_dentry(struct wim_dentry *dentry,
 	      struct wim_lookup_table *lookup_table)
 {
-	struct wim_inode *inode = dentry->d_inode;
-	struct wim_lookup_table_entry *lte;
-	unsigned i;
+	/* Put a reference to each stream the inode contains.  */
+	inode_unref_streams(dentry->d_inode, lookup_table);
 
-	for (i = 0; i <= inode->i_num_ads; i++) {
-		lte = inode_stream_lte(inode, i, lookup_table);
-		if (lte)
-			lte_decrement_refcnt(lte, lookup_table);
-	}
+	/* Unlink the dentry from the image's dentry tree.  */
 	unlink_dentry(dentry);
+
+	/* Delete the dentry.  This will also decrement the link count of the
+	 * corresponding inode.  */
 	free_dentry(dentry);
 }
 
 static mode_t
-inode_default_unix_mode(const struct wim_inode *inode)
+inode_unix_file_type(const struct wim_inode *inode)
 {
 	if (inode_is_symlink(inode))
-		return S_IFLNK | 0777;
+		return S_IFLNK;
 	else if (inode_is_directory(inode))
-		return S_IFDIR | 0777;
+		return S_IFDIR;
 	else
-		return S_IFREG | 0777;
+		return S_IFREG;
+}
+
+static mode_t
+inode_default_unix_mode(const struct wim_inode *inode)
+{
+	return inode_unix_file_type(inode) | 0777;
 }
 
 /* Transfers file attributes from a struct wim_inode to a `stat' buffer.
@@ -423,16 +411,16 @@ inode_to_stbuf(const struct wim_inode *inode,
 	const struct wimfs_context *ctx = wimfs_get_context();
 
 	memset(stbuf, 0, sizeof(struct stat));
-	stbuf->st_mode = inode_default_unix_mode(inode);
-	stbuf->st_uid = ctx->default_uid;
-	stbuf->st_gid = ctx->default_gid;
-	if (ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA) {
-		struct wimlib_unix_data unix_data;
-		if (inode_get_unix_data(inode, &unix_data, NULL) == 0) {
-			stbuf->st_uid = unix_data.uid;
-			stbuf->st_gid = unix_data.gid;
-			stbuf->st_mode = unix_data.mode;
-		}
+	if ((ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA) &&
+	    inode_has_unix_data(inode))
+	{
+		stbuf->st_uid = inode->i_unix_data.uid;
+		stbuf->st_gid = inode->i_unix_data.gid;
+		stbuf->st_mode = inode->i_unix_data.mode;
+	} else {
+		stbuf->st_uid = ctx->default_uid;
+		stbuf->st_gid = ctx->default_gid;
+		stbuf->st_mode = inode_default_unix_mode(inode);
 	}
 	stbuf->st_ino = (ino_t)inode->i_ino;
 	stbuf->st_nlink = inode->i_nlink;
@@ -1105,7 +1093,7 @@ send_unmount_request_msg(mqd_t mq, int unmount_flags, u8 want_progress_messages)
 	struct msg_unmount_request msg = {
 		.hdr = {
 			.min_version = ((unmount_flags & WIMLIB_UNMOUNT_FLAG_NEW_IMAGE) ?
-						WIMLIB_MAKEVERSION(1, 6, 1) :
+						WIMLIB_MAKEVERSION(1, 6, 2) :
 						WIMLIB_MAKEVERSION(1, 2, 1)),
 			.cur_version = WIMLIB_VERSION_CODE,
 			.msg_type    = MSG_TYPE_UNMOUNT_REQUEST,
@@ -1193,9 +1181,11 @@ release_extra_refcnts(struct wimfs_context *ctx)
 	struct wim_lookup_table *lookup_table = ctx->wim->lookup_table;
 	struct wim_lookup_table_entry *lte, *tmp;
 
-	list_for_each_entry_safe(lte, tmp, list, orig_stream_list)
-		while (lte->out_refcnt--)
+	list_for_each_entry_safe(lte, tmp, list, orig_stream_list) {
+		u32 n = lte->out_refcnt;
+		while (n--)
 			lte_decrement_refcnt(lte, lookup_table);
+	}
 }
 
 /* Moves the currently selected image, which may have been modified, to a new
@@ -1618,6 +1608,7 @@ static int
 wimfs_chmod(const char *path, mode_t mask)
 {
 	struct wim_dentry *dentry;
+	struct wim_inode *inode;
 	struct wimfs_context *ctx = wimfs_get_context();
 	int ret;
 
@@ -1629,16 +1620,21 @@ wimfs_chmod(const char *path, mode_t mask)
 	if (ret)
 		return ret;
 
-	ret = inode_set_unix_data(dentry->d_inode, ctx->default_uid,
-				  ctx->default_gid, mask,
-				  ctx->wim->lookup_table, UNIX_DATA_MODE);
-	return ret ? -ENOMEM : 0;
+	inode = dentry->d_inode;
+
+	if (!inode_has_unix_data(inode)) {
+		inode->i_unix_data.uid = ctx->default_uid;
+		inode->i_unix_data.gid = ctx->default_gid;
+	}
+	inode->i_unix_data.mode = mask;
+	return 0;
 }
 
 static int
 wimfs_chown(const char *path, uid_t uid, gid_t gid)
 {
 	struct wim_dentry *dentry;
+	struct wim_inode *inode;
 	struct wimfs_context *ctx = wimfs_get_context();
 	int ret;
 
@@ -1650,11 +1646,13 @@ wimfs_chown(const char *path, uid_t uid, gid_t gid)
 	if (ret)
 		return ret;
 
-	ret = inode_set_unix_data(dentry->d_inode, uid, gid,
-				  inode_default_unix_mode(dentry->d_inode),
-				  ctx->wim->lookup_table,
-				  UNIX_DATA_UID | UNIX_DATA_GID);
-	return ret ? -ENOMEM : 0;
+	inode = dentry->d_inode;
+
+	if (!inode_has_unix_data(inode))
+		inode->i_unix_data.mode = inode_default_unix_mode(inode);
+	inode->i_unix_data.uid = uid;
+	inode->i_unix_data.gid = gid;
+	return 0;
 }
 
 /* Called when the filesystem is unmounted. */
@@ -2045,32 +2043,6 @@ wimfs_read(const char *path, char *buf, size_t size,
 	return ret;
 }
 
-struct fill_params {
-	void *buf;
-	fuse_fill_dir_t filler;
-};
-
-static int
-dentry_fuse_fill(struct wim_dentry *dentry, void *arg)
-{
-	struct fill_params *fill_params = arg;
-
-	char *file_name_mbs;
-	size_t file_name_mbs_nbytes;
-	int ret;
-
-	ret = utf16le_to_tstr(dentry->file_name,
-			      dentry->file_name_nbytes,
-			      &file_name_mbs,
-			      &file_name_mbs_nbytes);
-	if (ret)
-		return -errno;
-
-	ret = fill_params->filler(fill_params->buf, file_name_mbs, NULL, 0);
-	FREE(file_name_mbs);
-	return ret;
-}
-
 /* Fills in the entries of the directory specified by @path using the
  * FUSE-provided function @filler.  */
 static int
@@ -2079,22 +2051,38 @@ wimfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
 {
 	struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
 	struct wim_inode *inode;
+	struct wim_dentry *child;
+	int ret;
 
 	if (!fd)
 		return -EBADF;
 
 	inode = fd->f_inode;
 
-	struct fill_params fill_params = {
-		.buf = buf,
-		.filler = filler,
-	};
+	ret = filler(buf, ".", NULL, 0);
+	if (ret)
+		return ret;
+	ret = filler(buf, "..", NULL, 0);
+	if (ret)
+		return ret;
 
-	filler(buf, ".", NULL, 0);
-	filler(buf, "..", NULL, 0);
+	for_inode_child(child, inode) {
+		char *file_name_mbs;
+		size_t file_name_mbs_nbytes;
 
-	return for_dentry_in_rbtree(inode->i_children.rb_node,
-				    dentry_fuse_fill, &fill_params);
+		ret = utf16le_to_tstr(child->file_name,
+				      child->file_name_nbytes,
+				      &file_name_mbs,
+				      &file_name_mbs_nbytes);
+		if (ret)
+			return -errno;
+
+		ret = filler(buf, file_name_mbs, NULL, 0);
+		FREE(file_name_mbs);
+		if (ret)
+			return ret;
+	}
+	return 0;
 }
 
 
@@ -2171,7 +2159,7 @@ static int
 wimfs_rename(const char *from, const char *to)
 {
 	return rename_wim_path(wimfs_get_WIMStruct(), from, to,
-			       WIMLIB_CASE_SENSITIVE);
+			       WIMLIB_CASE_SENSITIVE, NULL);
 }
 
 /* Remove a directory */
@@ -2345,14 +2333,12 @@ wimfs_unlink(const char *path)
 static int
 wimfs_utimens(const char *path, const struct timespec tv[2])
 {
-	struct wim_dentry *dentry;
 	struct wim_inode *inode;
 	WIMStruct *wim = wimfs_get_WIMStruct();
 
-	dentry = get_dentry(wim, path, WIMLIB_CASE_SENSITIVE);
-	if (!dentry)
+	inode = wim_pathname_to_inode(wim, path);
+	if (!inode)
 		return -errno;
-	inode = dentry->d_inode;
 
 	if (tv[0].tv_nsec != UTIME_OMIT) {
 		if (tv[0].tv_nsec == UTIME_NOW)
@@ -2372,14 +2358,12 @@ wimfs_utimens(const char *path, const struct timespec tv[2])
 static int
 wimfs_utime(const char *path, struct utimbuf *times)
 {
-	struct wim_dentry *dentry;
 	struct wim_inode *inode;
 	WIMStruct *wim = wimfs_get_WIMStruct();
 
-	dentry = get_dentry(wim, path, WIMLIB_CASE_SENSITIVE);
-	if (!dentry)
+	inode = wim_pathname_to_inode(wim, path);
+	if (!inode)
 		return -errno;
-	inode = dentry->d_inode;
 
 	inode->i_last_write_time = unix_timestamp_to_wim(times->modtime);
 	inode->i_last_access_time = unix_timestamp_to_wim(times->actime);
@@ -2615,7 +2599,7 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 #endif
 
 	/* Assign inode numbers.  Also, if a read-write mount was requested,
-	 * mark the dentry tree as modified, and add each streams referenced by
+	 * mark the dentry tree as modified, and 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.  */
@@ -2629,10 +2613,8 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 				struct wim_lookup_table_entry *lte;
 
 				lte = inode_stream_lte(inode, i, wim->lookup_table);
-				if (lte) {
-					lte->orig_stream_list = (struct list_head){NULL, NULL};
+				if (lte)
 					lte->out_refcnt = 0;
-				}
 			}
 		}
 		image_for_each_inode(inode, imd) {