summaryrefslogtreecommitdiff
path: root/source3/smbd/close.c
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2000-02-03 05:17:25 +0000
committerTim Potter <tpot@samba.org>2000-02-03 05:17:25 +0000
commit16bb009dbbe6302febf3848cee61e9927eeb0fb5 (patch)
tree2e6871c679d6de83e99133cb968c6fbbc89375b6 /source3/smbd/close.c
parent6df7bfbd9f5badd1d8489b7c329961441f71b471 (diff)
downloadsamba-16bb009dbbe6302febf3848cee61e9927eeb0fb5.tar.gz
samba-16bb009dbbe6302febf3848cee61e9927eeb0fb5.tar.bz2
samba-16bb009dbbe6302febf3848cee61e9927eeb0fb5.zip
Mega-VFS merge. Yeah baby!
Synopsis: change every disk access function to work through a vfs_ops structure contained in the connection_struct. (This used to be commit 3aad500c0fb61232ed3431ff4b743b5d18ec852f)
Diffstat (limited to 'source3/smbd/close.c')
-rw-r--r--source3/smbd/close.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 7f5769b368..8e2ed0de0e 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -117,10 +117,10 @@ static int close_normal_file(files_struct *fsp, BOOL normal_close)
locking_close_file(fsp);
- if(fd_attempt_close(fsp->fd_ptr,&err) == 0)
+ if(fd_attempt_close(fsp, &err) == 0)
last_reference = True;
- fsp->fd_ptr = NULL;
+ fsp->fd_ptr = NULL;
if (lp_share_modes(SNUM(conn)))
unlock_share_entry(conn, dev, inode);
@@ -142,8 +142,7 @@ static int close_normal_file(files_struct *fsp, BOOL normal_close)
if (normal_close && last_reference && delete_on_close) {
DEBUG(5,("close_file: file %s. Delete on close was set - deleting file.\n",
fsp->fsp_name));
- if(dos_unlink(fsp->fsp_name) != 0) {
-
+ if(fsp->conn->vfs_ops.unlink(dos_to_unix(fsp->fsp_name, False)) != 0) {
/*
* This call can potentially fail as another smbd may have
* had the file open with delete on close set and deleted