summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-02-17 18:47:40 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:18:02 -0500
commitbca83e3b082d0f352d23a33a9774d5b577004bc5 (patch)
tree16d429a0be66ecb6afb5df38c9d266fe6c70d324
parent9162cb768481a1fd404d3355a92f672bdda580a4 (diff)
downloadsamba-bca83e3b082d0f352d23a33a9774d5b577004bc5.tar.gz
samba-bca83e3b082d0f352d23a33a9774d5b577004bc5.tar.bz2
samba-bca83e3b082d0f352d23a33a9774d5b577004bc5.zip
r21409: saved_status1 is not used anymore after aio write behind was removed
(This used to be commit 29a1892c131ed41a06d3dcfdb5d21371e60c1ba6)
-rw-r--r--source3/smbd/close.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index a21399ba03..50111f62bb 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -318,7 +318,6 @@ static NTSTATUS close_normal_file(files_struct *fsp, enum file_close_type close_
NTSTATUS status = NT_STATUS_OK;
NTSTATUS saved_status1 = NT_STATUS_OK;
NTSTATUS saved_status2 = NT_STATUS_OK;
- NTSTATUS saved_status3 = NT_STATUS_OK;
connection_struct *conn = fsp->conn;
cancel_aio_by_fsp(fsp);
@@ -328,7 +327,7 @@ static NTSTATUS close_normal_file(files_struct *fsp, enum file_close_type close_
* error here, we must remember this.
*/
- saved_status2 = close_filestruct(fsp);
+ saved_status1 = close_filestruct(fsp);
if (fsp->print_file) {
print_fsp_end(fsp, close_type);
@@ -342,7 +341,7 @@ static NTSTATUS close_normal_file(files_struct *fsp, enum file_close_type close_
if (fsp->fh->ref_count == 1) {
/* Should we return on error here... ? */
- saved_status3 = close_remove_share_mode(fsp, close_type);
+ saved_status2 = close_remove_share_mode(fsp, close_type);
}
if(fsp->oplock_type) {
@@ -373,8 +372,6 @@ static NTSTATUS close_normal_file(files_struct *fsp, enum file_close_type close_
status = saved_status1;
} else if (!NT_STATUS_IS_OK(saved_status2)) {
status = saved_status2;
- } else if (!NT_STATUS_IS_OK(saved_status3)) {
- status = saved_status3;
}
}