summaryrefslogtreecommitdiff
path: root/source3/smbd/close.c
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-02-11 14:39:21 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:17:53 -0500
commitd9a29aade0f01df1fa00ccdb8691b02b39bc1d14 (patch)
tree90e207a596fea2c25a850476bf522384dbe9f5b8 /source3/smbd/close.c
parentfe881c3e38bb25a6716d94df362a5580afbdfd8b (diff)
downloadsamba-d9a29aade0f01df1fa00ccdb8691b02b39bc1d14.tar.gz
samba-d9a29aade0f01df1fa00ccdb8691b02b39bc1d14.tar.bz2
samba-d9a29aade0f01df1fa00ccdb8691b02b39bc1d14.zip
r21279: Get rid of 'aio write behind', this is broken.
It should probably better be integrated with our write cache. Volker (This used to be commit 58bfd168b046a97a895aaa3384fd7af8d077a1d5)
Diffstat (limited to 'source3/smbd/close.c')
-rw-r--r--source3/smbd/close.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index eea8fa01d5..52cd90f54a 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -321,18 +321,7 @@ static NTSTATUS close_normal_file(files_struct *fsp, enum file_close_type close_
NTSTATUS saved_status3 = NT_STATUS_OK;
connection_struct *conn = fsp->conn;
- if (fsp->aio_write_behind) {
- /*
- * If we're finishing write behind on a close we can get a write
- * error here, we must remember this.
- */
- int ret = wait_for_aio_completion(fsp);
- if (ret) {
- saved_status1 = map_nt_error_from_unix(ret);
- }
- } else {
- cancel_aio_by_fsp(fsp);
- }
+ cancel_aio_by_fsp(fsp);
/*
* If we're flushing on a close we can get a write