Changeset 370 for branches/samba-3.3.x/source/smbd/aio.c

Timestamp:

Jan 15, 2010, 8:23:30 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.10 (source)

File:

• branches/samba-3.3.x/source/smbd/aio.c (modified) (11 diffs)

branches/samba-3.3.x/source/smbd/aio.c

@@ -427 +427 @@
 *****************************************************************************/
 
-static int handle_aio_read_complete(struct aio_extra *aio_ex)
-{
-        int ret = 0;
+static int handle_aio_read_complete(struct aio_extra *aio_ex, int errcode)
+{
         int outsize;
         char *outbuf = aio_ex->outbuf;
@@ -441 +440 @@
                    true.... JRA. */
 
-                /* If errno is ECANCELED then don't return anything to the
-                 * client. */
-                if (errno == ECANCELED) {
-                        srv_cancel_sign_response(aio_ex->mid, false);
-                        return 0;
-                }
-
-                DEBUG( 3,( "handle_aio_read_complete: file %s nread == -1. "
+                DEBUG( 3,( "handle_aio_read_complete: file %s nread == %d. "
                            "Error = %s\n",
-                           aio_ex->fsp->fsp_name, strerror(errno) ));
-
-                ret = errno;
-                ERROR_NT(map_nt_error_from_unix(ret));
+                           aio_ex->fsp->fsp_name, (int)nread, strerror(errcode) ));
+
+                ERROR_NT(map_nt_error_from_unix(errcode));
                 outsize = srv_set_message(outbuf,0,0,true);
         } else {
@@ -485 +476 @@
                   (unsigned int)nread ));
 
-        return ret;
+        return errcode;
 }
 
@@ -493 +484 @@
 *****************************************************************************/
 
-static int handle_aio_write_complete(struct aio_extra *aio_ex)
-{
-        int ret = 0;
+static int handle_aio_write_complete(struct aio_extra *aio_ex, int errcode)
+{
         files_struct *fsp = aio_ex->fsp;
         char *outbuf = aio_ex->outbuf;
@@ -507 +497 @@
                                          "aio_write_behind failed ! File %s "
                                          "is corrupt ! Error %s\n",
-                                         fsp->fsp_name, strerror(errno) ));
-                                ret = errno;
+                                         fsp->fsp_name, strerror(errcode) ));
                         } else {
                                 DEBUG(0,("handle_aio_write_complete: "
@@ -516 +505 @@
                                          (unsigned int)numtowrite,
                                          (int)nwritten ));
-                                ret = EIO;
+                                errcode = EIO;
                         }
                 } else {
@@ -523 +512 @@
                                   fsp->fsp_name ));
                 }
+                /* TODO: should no return 0 in case of an error !!! */
                 return 0;
         }
@@ -535 +525 @@
                            (int)nwritten, strerror(errno) ));
 
-                /* If errno is ECANCELED then don't return anything to the
-                 * client. */
-                if (errno == ECANCELED) {
-                        srv_cancel_sign_response(aio_ex->mid, false);
-                        return 0;
-                }
-
-                ret = errno;
-                ERROR_BOTH(map_nt_error_from_unix(ret), ERRHRD, ERRdiskfull);
+                ERROR_NT(map_nt_error_from_unix(errcode));
                 srv_set_message(outbuf,0,0,true);
         } else {
@@ -560 +542 @@
                 status = sync_file(fsp->conn,fsp, write_through);
                 if (!NT_STATUS_IS_OK(status)) {
-                        ret = errno;
-                        ERROR_BOTH(map_nt_error_from_unix(ret),
+                        errcode = errno;
+                        ERROR_BOTH(map_nt_error_from_unix(errcode),
                                    ERRHRD, ERRdiskfull);
                         srv_set_message(outbuf,0,0,true);
@@ -581 +563 @@
                   (unsigned int)numtowrite, (unsigned int)nwritten ));
 
-        return ret;
+        return errcode;
 }
 
@@ -599 +581 @@
 
         /* Ensure the operation has really completed. */
-        if (SMB_VFS_AIO_ERROR(aio_ex->fsp, &aio_ex->acb) == EINPROGRESS) {
+        err = SMB_VFS_AIO_ERROR(aio_ex->fsp, &aio_ex->acb);
+        if (err == EINPROGRESS) {
                 DEBUG(10,( "handle_aio_completed: operation mid %u still in "
                            "process for file %s\n",
                            aio_ex->mid, aio_ex->fsp->fsp_name ));
                 return False;
-        }
+        } else if (err == ECANCELED) {
+                /* If error is ECANCELED then don't return anything to the
+                 * client. */
+                DEBUG(10,( "handle_aio_completed: operation mid %u"
+                        " canceled\n", aio_ex->mid));
+                srv_cancel_sign_response(aio_ex->mid, false);
+                return True;
+        }
+
 
         if (aio_ex->read_req) {
-                err = handle_aio_read_complete(aio_ex);
+                err = handle_aio_read_complete(aio_ex, err);
         } else {
-                err = handle_aio_write_complete(aio_ex);
+                err = handle_aio_write_complete(aio_ex, err);
         }