Changeset 204 for branches/samba-3.2.x/source/smbd/aio.c

Timestamp:

May 20, 2009, 6:46:53 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.4

File:

• branches/samba-3.2.x/source/smbd/aio.c (modified) (4 diffs)

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

@@ -25 +25 @@
 /* The signal we'll use to signify aio done. */
 #ifndef RT_SIGNAL_AIO
-#define RT_SIGNAL_AIO (SIGRTMIN+3)
+#ifndef SIGRTMIN
+#define SIGRTMIN        NSIG
+#endif
+#define RT_SIGNAL_AIO   (SIGRTMIN+3)
+#endif
+
+#ifndef HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIVAL_PTR
+#ifdef HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIGVAL_PTR
+#define sival_int       sigval_int
+#define sival_ptr       sigval_ptr
+#endif
 #endif
 
@@ -269 +279 @@
         a->aio_sigevent.sigev_value.sival_int = aio_ex->mid;
 
+        become_root();
         if (SMB_VFS_AIO_READ(fsp,a) == -1) {
                 DEBUG(0,("schedule_aio_read_and_X: aio_read failed. "
                          "Error %s\n", strerror(errno) ));
                 delete_aio_ex(aio_ex);
-                return False;
-        }
+                unbecome_root();
+                return False;
+        }
+        unbecome_root();
 
         DEBUG(10,("schedule_aio_read_and_X: scheduled aio_read for file %s, "
@@ -367 +380 @@
         a->aio_sigevent.sigev_value.sival_int = aio_ex->mid;
 
+        become_root();
         if (SMB_VFS_AIO_WRITE(fsp,a) == -1) {
                 DEBUG(3,("schedule_aio_wrote_and_X: aio_write failed. "
                          "Error %s\n", strerror(errno) ));
                 delete_aio_ex(aio_ex);
-                return False;
-        }
-
+                unbecome_root();
+                return False;
+        }
+        unbecome_root();
+        
         release_level_2_oplocks_on_change(fsp);
 
@@ -576 +592 @@
         int err;
 
+        if(!aio_ex) {
+                DEBUG(3, ("handle_aio_completed: Non-existing aio_ex passed\n"));
+                return false;
+        }
+
         /* Ensure the operation has really completed. */
         if (SMB_VFS_AIO_ERROR(aio_ex->fsp, &aio_ex->acb) == EINPROGRESS) {