Common code to close a file or a directory.
****************************************************************************/
-void close_filestruct(files_struct *fsp)
+static int close_filestruct(files_struct *fsp)
{
connection_struct *conn = fsp->conn;
+ int ret = 0;
- flush_write_cache(fsp, CLOSE_FLUSH);
+ if(flush_write_cache(fsp, CLOSE_FLUSH) == -1)
+ ret = -1;
+
+ delete_write_cache(fsp);
fsp->is_directory = False;
fsp->stat_open = False;
free((char *)fsp->wbmpx_ptr);
fsp->wbmpx_ptr = NULL;
}
+
+ return ret;
}
/****************************************************************************
BOOL delete_on_close = fsp->delete_on_close;
connection_struct *conn = fsp->conn;
int err = 0;
+ int err1 = 0;
remove_pending_lock_requests_by_fid(fsp);
- close_filestruct(fsp);
+ /*
+ * If we're flushing on a close we can get a write
+ * error here, we must remember this.
+ */
+
+ if (close_filestruct(fsp) == -1)
+ err1 = -1;
if (normal_close && fsp->print_file) {
print_fsp_end(fsp);
file_free(fsp);
- return err;
+ if (err == -1 || err1 == -1)
+ return -1;
+ else
+ return 0;
}
/****************************************************************************
* the write cache.
*/
- if ((fsp->oplock_type == EXCLUSIVE_OPLOCK) && !wcp) {
+ if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type) && !wcp) {
setup_write_cache(fsp, st.st_size);
wcp = fsp->wcp;
}
free(wcp);
fsp->wcp = NULL;
+
+ DEBUG(10,("delete_write_cache: File %s deleted write cache\n", fsp->fsp_name ));
+
}
/****************************************************************************
fsp->wcp = wcp;
allocated_write_caches++;
+ DEBUG(10,("setup_write_cache: File %s allocated write cache size %u\n",
+ fsp->fsp_name, wcp->alloc_size ));
+
return True;
}