From 20736292a452eb750f23b958e9fd5e3561eaffe7 Mon Sep 17 00:00:00 2001 From: volcanodragon Date: Tue, 30 Nov 2021 17:53:54 +0800 Subject: [PATCH 1/3] revert fuse_daemonize chdir to \ even if not run in background (cherry picked from commit dd983afbc811ee3979192949e9e6321537edef31) --- ...e_daemonize-chdir-to-even-if-not-run.patch | 34 +++++++++++++++++++ fuse3.spec | 6 +++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 0002-revert-fuse_daemonize-chdir-to-even-if-not-run.patch diff --git a/0002-revert-fuse_daemonize-chdir-to-even-if-not-run.patch b/0002-revert-fuse_daemonize-chdir-to-even-if-not-run.patch new file mode 100644 index 0000000..d0f1173 --- /dev/null +++ b/0002-revert-fuse_daemonize-chdir-to-even-if-not-run.patch @@ -0,0 +1,34 @@ +From 2b50633a79f77ceec5bdec8e58cad8b78c244073 Mon Sep 17 00:00:00 2001 +From: Lixiaokeng +Date: Tue, 30 Nov 2021 17:17:07 +0800 +Subject: [PATCH] fuse3: revert "fuse_daemonize(): chdir to / even if not + running in the background" + +fuse_daemonize(): chdir to "/" even if not running in the background +for consistency, but in some cases, we need to use relative-path in +foreground, such as the feature nvme-cuse in SPDK 21.01. So we revert +this commit. + +Signed-off-by: Lixiaokeng +Signed-off-by: Weifeng Su +Signed-off-by: volcanodragon +--- + lib/helper.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/lib/helper.c b/lib/helper.c +index 64ff7ad..9c03b79 100644 +--- a/lib/helper.c ++++ b/lib/helper.c +@@ -270,8 +270,6 @@ int fuse_daemonize(int foreground) + (void) write(waiter[1], &completed, sizeof(completed)); + close(waiter[0]); + close(waiter[1]); +- } else { +- (void) chdir("/"); + } + return 0; + } +-- +1.8.3.1 + diff --git a/fuse3.spec b/fuse3.spec index aae2569..d55d41b 100644 --- a/fuse3.spec +++ b/fuse3.spec @@ -2,7 +2,7 @@ Name: fuse3 Version: %{fuse3ver} -Release: 6 +Release: 2 Summary: User space File System of fuse3 License: GPL+ and LGPLv2+ URL: http://fuse.sf.net @@ -10,6 +10,7 @@ Source0: https://github.com/libfuse/libfuse/archive/fuse-%{fuse3ver}.tar.xz Source1: fuse.conf Patch1: 0001-fix-chown-and-mknod-failed.patch +Patch2: 0002-revert-fuse_daemonize-chdir-to-even-if-not-run.patch BuildRequires: libselinux-devel, pkgconfig, systemd-udev, meson, fdupes BuildRequires: autoconf, automake, libtool, gettext-devel, ninja-build @@ -100,6 +101,9 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir} %{_mandir}/man8/* %changelog +* Tue Nov 30 2021 lixiaokeng -3.10.5-2 +- revert fuse_daemonize chdir to / even if not run background. + * Tue Nov 23 2021 lixiaokeng -3.10.5-1 - upgrade to 3.10.5 -- Gitee From 2afce228d0c3dac19f98129a719939e3ae69cb6c Mon Sep 17 00:00:00 2001 From: volcanodragon Date: Tue, 30 Nov 2021 19:22:34 +0800 Subject: [PATCH 2/3] fix version (cherry picked from commit c658d0b47a3e77a7926548b44a0ea0627b40930f) --- fuse3.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fuse3.spec b/fuse3.spec index d55d41b..ae5c362 100644 --- a/fuse3.spec +++ b/fuse3.spec @@ -2,7 +2,7 @@ Name: fuse3 Version: %{fuse3ver} -Release: 2 +Release: 7 Summary: User space File System of fuse3 License: GPL+ and LGPLv2+ URL: http://fuse.sf.net @@ -101,10 +101,10 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir} %{_mandir}/man8/* %changelog -* Tue Nov 30 2021 lixiaokeng -3.10.5-2 +* Tue Nov 30 2021 lixiaokeng -3.10.5-7 - revert fuse_daemonize chdir to / even if not run background. -* Tue Nov 23 2021 lixiaokeng -3.10.5-1 +* Tue Nov 23 2021 lixiaokeng -3.10.5-6 - upgrade to 3.10.5 * Mon Jul 26 2021 lixiaokeng -3.9.2-6 -- Gitee From 90af6af4674adce6442882256af48de277cc2c8d Mon Sep 17 00:00:00 2001 From: volcanodragon Date: Tue, 30 Nov 2021 20:56:29 +0800 Subject: [PATCH 3/3] fix version (cherry picked from commit f7708f10f73ceae0a9d6996319cc099f89963b70) --- fuse3.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fuse3.spec b/fuse3.spec index ae5c362..d55d41b 100644 --- a/fuse3.spec +++ b/fuse3.spec @@ -2,7 +2,7 @@ Name: fuse3 Version: %{fuse3ver} -Release: 7 +Release: 2 Summary: User space File System of fuse3 License: GPL+ and LGPLv2+ URL: http://fuse.sf.net @@ -101,10 +101,10 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir} %{_mandir}/man8/* %changelog -* Tue Nov 30 2021 lixiaokeng -3.10.5-7 +* Tue Nov 30 2021 lixiaokeng -3.10.5-2 - revert fuse_daemonize chdir to / even if not run background. -* Tue Nov 23 2021 lixiaokeng -3.10.5-6 +* Tue Nov 23 2021 lixiaokeng -3.10.5-1 - upgrade to 3.10.5 * Mon Jul 26 2021 lixiaokeng -3.9.2-6 -- Gitee