From: Jeremy Allison <jra@samba.org>
Date: Fri, 4 Oct 2019 22:04:02 +0000 (-0700)
Subject: s3: VFS: vfs_posix_eadb: Rename posix_eadb_rmdir() to posix_eadb_rmdir_internal().
X-Git-Tag: talloc-2.3.1~427
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=4e028aeaff99b4fee71925bca8d3eae0a4841947

s3: VFS: vfs_posix_eadb: Rename posix_eadb_rmdir() to posix_eadb_rmdir_internal().

Make rmdir_fn() a wrapper function. This will
allow us to add the dirfsp parameter.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/modules/vfs_posix_eadb.c b/source3/modules/vfs_posix_eadb.c
index db7471c19d2..eea1129a8e8 100644
--- a/source3/modules/vfs_posix_eadb.c
+++ b/source3/modules/vfs_posix_eadb.c
@@ -358,7 +358,7 @@ out:
 /*
  * On rmdir we need to delete the tdb record
  */
-static int posix_eadb_rmdir(vfs_handle_struct *handle,
+static int posix_eadb_rmdir_internal(vfs_handle_struct *handle,
 			const struct smb_filename *smb_fname)
 {
 	NTSTATUS status;
@@ -399,7 +399,7 @@ static int posix_eadb_unlinkat(vfs_handle_struct *handle,
 
 	SMB_ASSERT(dirfsp == dirfsp->conn->cwd_fsp);
 	if (flags & AT_REMOVEDIR) {
-		ret = posix_eadb_rmdir(handle, smb_fname);
+		ret = posix_eadb_rmdir_internal(handle, smb_fname);
 	} else {
 		ret = posix_eadb_unlink_internal(handle,
 					dirfsp,
@@ -409,6 +409,16 @@ static int posix_eadb_unlinkat(vfs_handle_struct *handle,
 	return ret;
 }
 
+/*
+ * On rmdir we need to delete the tdb record
+ */
+static int posix_eadb_rmdir(vfs_handle_struct *handle,
+			const struct smb_filename *smb_fname)
+{
+	return posix_eadb_rmdir_internal(handle,
+					smb_fname);
+}
+
 /*
  * Destructor for the VFS private data
  */