D55231.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D55231.diff
View Options

	diff --git a/sys/fs/fuse/fuse_ipc.h b/sys/fs/fuse/fuse_ipc.h
	--- a/sys/fs/fuse/fuse_ipc.h
	+++ b/sys/fs/fuse/fuse_ipc.h
	@@ -194,8 +194,6 @@
	*/
	u_long ticketer;

	- struct sx rename_lock;
	-
	uint32_t fuse_libabi_major;
	uint32_t fuse_libabi_minor;

	diff --git a/sys/fs/fuse/fuse_ipc.c b/sys/fs/fuse/fuse_ipc.c
	--- a/sys/fs/fuse/fuse_ipc.c
	+++ b/sys/fs/fuse/fuse_ipc.c
	@@ -550,7 +550,6 @@
	TAILQ_INIT(&data->aw_head);
	data->daemoncred = crhold(cred);
	data->daemon_timeout = FUSE_DEFAULT_DAEMON_TIMEOUT;
	- sx_init(&data->rename_lock, "fuse rename lock");
	data->ref = 1;

	return data;
	@@ -565,7 +564,6 @@
	return;

	/* Driving off stage all that stuff thrown at device... */
	- sx_destroy(&data->rename_lock);
	crfree(data->daemoncred);
	mtx_destroy(&data->aw_mtx);
	knlist_delete(&data->ks_rsel.si_note, curthread, 0);
	diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c
	--- a/sys/fs/fuse/fuse_vnops.c
	+++ b/sys/fs/fuse/fuse_vnops.c
	@@ -2272,7 +2272,6 @@
	if (err)
	goto out;
	}
	- sx_xlock(&data->rename_lock);
	err = fuse_internal_rename(fdvp, fcnp, tdvp, tcnp);
	if (err == 0) {
	if (tdvp != fdvp)
	@@ -2280,7 +2279,6 @@
	if (tvp != NULL)
	fuse_vnode_setparent(tvp, NULL);
	}
	- sx_unlock(&data->rename_lock);

	if (tvp != NULL && tvp != fvp) {
	cache_purge(tvp);