From be828fcec88a43306ddfb53473fda52df1d9965b Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 28 Apr 2000 00:39:23 +0000
Subject: Made changes suggested by Andrew review. fd_close now calls
 fd_close_posix() directly. set_posix_lock/release_posix_lock() now handle the
 reference counting. More changes due when this gets moved to the file
 locking/posix.c Jeremy. (This used to be commit
 239abd48f049c6a8d2bbc0636eacf347ab77588c)

---
 source3/smbd/open.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'source3/smbd/open.c')

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 737b9b5ef3..9aadb39bc9 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -55,21 +55,7 @@ static int fd_open(struct connection_struct *conn, char *fname,
 
 int fd_close(struct connection_struct *conn, files_struct *fsp)
 {
-	int ret = 0;
-
-	/*
-	 * Deal with transferring any pending fd's if there
-	 * are POSIX locks outstanding.
-	 */
-
-	if(!fd_close_posix_locks(conn,fsp))
-		return -1;
-
-	if(fsp->fd != -1)
-		ret = conn->vfs_ops.close(fsp->fd);
-
-	fsp->fd = -1;
-	return ret;
+	return fd_close_posix(conn, fsp);
 }
 
 
-- 
cgit