From: Volker Lendecke Date: Fri, 13 Jul 2012 06:38:07 +0000 (+0200) Subject: s3: Make us survive smb2.lock.rw-shared with aio enabled X-Git-Url: http://git.samba.org/?p=mat%2Fsamba.git;a=commitdiff_plain;h=27e20d5d60ea8aa526bcb7c2dfc18dd2de0bb97b 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 Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Fri Jul 13 21:53:51 CEST 2012 on sn-devel-104 --- 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); }