first pass at updating head branch to be to be the same as the SAMBA_2_0 branch

[samba.git] / source3 / smbd / files.c

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 7f4533e7ae78ef10044a4ea2269e8c4c122b3d4c..d6203580cf54f563a5c79c3f24315ff113d0eeec 100644 (file)
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -186,10 +186,7 @@ void file_close_conn(connection_struct *conn)
        for (fsp=Files;fsp;fsp=next) {
                next = fsp->next;
                if (fsp->conn == conn && fsp->open) {
-                       if (fsp->is_directory)
-                               close_directory(fsp); 
-                       else                  
-                               close_file(fsp,False); 
+                       close_file(fsp,False); 
                }
        }
 }
@@ -226,7 +223,7 @@ open files, %d are available.\n", request_max_open_files, real_max_open_files));
        }
        
        /*
-        * Ensure that pipe_handle_offset is set correctly.
+        * Ensure that pipe_handle_oppset is set correctly.
         */
        set_pipe_handle_offset(real_max_open_files);
 }
@@ -242,10 +239,7 @@ void file_close_user(int vuid)
        for (fsp=Files;fsp;fsp=next) {
                next=fsp->next;
                if ((fsp->vuid == vuid) && fsp->open) {
-                       if(!fsp->is_directory)
-                               close_file(fsp,False);
-                       else
-                               close_directory(fsp);
+                       close_file(fsp,False);
                }
        }
 }
@@ -340,13 +334,13 @@ void file_sync_all(connection_struct *conn)
 
        for (fsp=Files;fsp;fsp=next) {
                next=fsp->next;
-               if (fsp->open && (conn == fsp->conn) && (fsp->fd_ptr != NULL)
-                   && lp_strict_sync(SNUM(conn))){
-                   conn->vfs_ops.sync(fsp->fd_ptr->fd);
+               if (fsp->open && (conn == fsp->conn) && (fsp->fd_ptr != NULL)) {
+                       sync_file(conn,fsp);
                }
        }
 }
 
+
 /****************************************************************************
 free up a fd_ptr
 ****************************************************************************/