summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-07-13 08:38:07 +0200
committerJeremy Allison <jra@samba.org>2012-07-13 21:53:51 +0200
commit27e20d5d60ea8aa526bcb7c2dfc18dd2de0bb97b (patch)
tree0b009c67e3ba8e7d3ad7a26f1763455206ed8828
parent10b818bb222aaec4de2c31594e5ca48102f7af6a (diff)
downloadsamba-27e20d5d60ea8aa526bcb7c2dfc18dd2de0bb97b.tar.gz
samba-27e20d5d60ea8aa526bcb7c2dfc18dd2de0bb97b.tar.bz2
samba-27e20d5d60ea8aa526bcb7c2dfc18dd2de0bb97b.zip
s3: Make us survive smb2.lock.rw-shared with aio enabled
schedule_aio_smb2_write can return NT_STATUS_FILE_LOCK_CONFLICT. This is a valid error code that smb2.lock.rw-shared expects and checks for. The code before this patch maps this to NT_STATUS_FILE_CLOSED, masking the real, correct error message. Signed-off-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Fri Jul 13 21:53:51 CEST 2012 on sn-devel-104
-rw-r--r--source3/smbd/smb2_write.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/smb2_write.c b/source3/smbd/smb2_write.c
index 8ddd8cc783..6a78939505 100644
--- a/source3/smbd/smb2_write.c
+++ b/source3/smbd/smb2_write.c
@@ -318,7 +318,7 @@ static struct tevent_req *smbd_smb2_write_send(TALLOC_CTX *mem_ctx,
if (!NT_STATUS_EQUAL(status, NT_STATUS_RETRY)) {
/* Real error in setting up aio. Fail. */
- tevent_req_nterror(req, NT_STATUS_FILE_CLOSED);
+ tevent_req_nterror(req, status);
return tevent_req_post(req, ev);
}