Mercurial > nomad

changeset 867:0694e4cf0753

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fs: move unlink code into a helper This helper will handler rmdir as well. Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
author Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
date Sat, 17 Dec 2022 20:09:37 -0500
parents eca18abb5295
children 90d2af779270
files src/fs/nomadfs.c
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/fs/nomadfs.c	Sat Dec 17 20:08:29 2022 -0500
+++ b/src/fs/nomadfs.c	Sat Dec 17 20:09:37 2022 -0500
@@ -298,7 +298,8 @@
 	nomadfs_mknod(req, parent, name, mode, 0);
 }
 
-static void nomadfs_unlink(fuse_req_t req, fuse_ino_t parent, const char *name)
+static void __unlink(fuse_req_t req, fuse_ino_t parent, const char *name,
+		     bool rmdir)
 {
 	uint32_t dir_ohandle;
 	int ret;
@@ -307,7 +308,7 @@
 	if (ret)
 		goto err;
 
-	ret = fscall_unlink(&state, dir_ohandle, name, NULL, false);
+	ret = fscall_unlink(&state, dir_ohandle, name, NULL, rmdir);
 	if (ret)
 		goto err_close;
 
@@ -326,6 +327,11 @@
 	fuse_reply_err(req, -nerr_to_errno(ret));
 }
 
+static void nomadfs_unlink(fuse_req_t req, fuse_ino_t parent, const char *name)
+{
+	__unlink(req, parent, name, false);
+}
+
 static int reply_slice(fuse_req_t req, void *buf, size_t bufsize,
 		       off_t fuse_off, size_t fuse_size)
 {