s3: VFS: vfs_streams_xattr. Wrap Convert streams_xattr_unlink() -> streams_xattr_unli...

Make streams_xattr_unlink() a wrapper calling the internal version.

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

diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c
index ea2f902502bc91fdb924b5e266b46c85aeae81d2..b04fe723b67f3ed0cd12af25f4b739ddfbfda051 100644 (file)
--- a/source3/modules/vfs_streams_xattr.c
+++ b/source3/modules/vfs_streams_xattr.c
@@ -546,8 +546,10 @@ static int streams_xattr_close(vfs_handle_struct *handle,
        return ret;
 }
 
-static int streams_xattr_unlink(vfs_handle_struct *handle,
-                               const struct smb_filename *smb_fname)
+static int streams_xattr_unlink_internal(vfs_handle_struct *handle,
+                       struct files_struct *dirfsp,
+                       const struct smb_filename *smb_fname,
+                       int flags)
 {
        NTSTATUS status;
        int ret = -1;
@@ -594,6 +596,15 @@ static int streams_xattr_unlink(vfs_handle_struct *handle,
        return ret;
 }
 
+static int streams_xattr_unlink(vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname)
+{
+       return streams_xattr_unlink_internal(handle,
+                               handle->conn->cwd_fsp,
+                               smb_fname,
+                               0);
+}
+
 static int streams_xattr_unlinkat(vfs_handle_struct *handle,
                        struct files_struct *dirfsp,
                        const struct smb_filename *smb_fname,
@@ -606,8 +617,10 @@ static int streams_xattr_unlinkat(vfs_handle_struct *handle,
                                smb_fname,
                                flags);
        } else {
-               ret = streams_xattr_unlink(handle,
-                               smb_fname);
+               ret = streams_xattr_unlink_internal(handle,
+                               dirfsp,
+                               smb_fname,
+                               flags);
        }
        return ret;
 }