From 19e88da1dcbc553d443b4c224d186ccda09672b6 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 12 Apr 2013 11:17:00 +0200 Subject: vfs: Convert recycle_unlink to synthetic_smb_fname Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- source3/modules/vfs_recycle.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c index ed9a28091f..00d7f34f2f 100644 --- a/source3/modules/vfs_recycle.c +++ b/source3/modules/vfs_recycle.c @@ -442,7 +442,6 @@ static int recycle_unlink(vfs_handle_struct *handle, off_t maxsize, minsize; off_t file_size; /* space_avail; */ bool exist; - NTSTATUS status; int rc = -1; repository = talloc_sub_advanced(NULL, lp_servicename(talloc_tos(), SNUM(conn)), @@ -575,10 +574,9 @@ static int recycle_unlink(vfs_handle_struct *handle, } /* Create smb_fname with final base name and orig stream name. */ - status = create_synthetic_smb_fname(talloc_tos(), final_name, - smb_fname->stream_name, NULL, - &smb_fname_final); - if (!NT_STATUS_IS_OK(status)) { + smb_fname_final = synthetic_smb_fname(talloc_tos(), final_name, + smb_fname->stream_name, NULL); + if (smb_fname_final == NULL) { rc = SMB_VFS_NEXT_UNLINK(handle, smb_fname); goto done; } -- cgit