[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  c616379 s3-includes: when MADVISE support was reverted back in 2009, someone forgot this hunk.
       via  89e6055 s3-includes: move enum flush_reason_enum to smb.h
       via  a360945 s3-includes: remove ipv6 related prototype which is already defined in ../lib/util/util_net.h.
       via  4fa2bac s3-system: move LOCK_ defines to lib/system.c
      from  0232604 s3: Handle EINTR from sys_poll correctly

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c616379e14f7db35429ac849bbc6eb3d4dc641ec
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 3 16:28:44 2011 +0200

    s3-includes: when MADVISE support was reverted back in 2009, someone forgot this hunk.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Tue May  3 22:06:20 CEST 2011 on sn-devel-104

commit 89e60556065c6e3dc7a8447cdba5a8fed1d19ea4
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 3 16:25:20 2011 +0200

    s3-includes: move enum flush_reason_enum to smb.h
    
    Guenther

commit a3609457912123037ca9fc51349d89d7921bc4e7
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 3 16:16:50 2011 +0200

    s3-includes: remove ipv6 related prototype which is already defined in ../lib/util/util_net.h.
    
    Guenther

commit 4fa2bac6e7ebe11447b535d9c8ec4348a2bbd39e
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 3 14:45:47 2011 +0200

    s3-system: move LOCK_ defines to lib/system.c
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/include/includes.h |   34 ----------------------------------
 source3/include/smb.h      |   16 ++++++++++++++++
 source3/lib/system.c       |    9 +++++++++
 3 files changed, 25 insertions(+), 34 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/includes.h b/source3/include/includes.h
index f4cac1a..0079619 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -173,10 +173,6 @@
 #include <aio.h>
 #endif
 
-#ifdef WITH_MADVISE_PROTECTED
-#include <sys/mman.h>
-#endif
-
 /* Special macros that are no-ops except when run under Valgrind on
  * x86.  They've moved a little bit from valgrind 1.0.4 to 1.9.4 */
 #if HAVE_VALGRIND_MEMCHECK_H
@@ -542,22 +538,6 @@ typedef char fstring[FSTRING_LEN];
 #include "../lib/util/smb_threads.h"
 #include "../lib/util/smb_threads_internal.h"
 
-/*
- * Reasons for cache flush.
- */
-
-enum flush_reason_enum {
-    SEEK_FLUSH,
-    READ_FLUSH,
-    WRITE_FLUSH,
-    READRAW_FLUSH,
-    OPLOCK_RELEASE_FLUSH,
-    CLOSE_FLUSH,
-    SYNC_FLUSH,
-    SIZECHANGE_FLUSH,
-    /* NUM_FLUSH_REASONS must remain the last value in the enumeration. */
-    NUM_FLUSH_REASONS};
-
 /***** prototypes *****/
 #ifndef NO_PROTO_H
 #include "proto.h"
@@ -602,15 +582,6 @@ enum flush_reason_enum {
 #endif
 
 
-#if HAVE_KERNEL_SHARE_MODES
-#ifndef LOCK_MAND 
-#define LOCK_MAND	32	/* This is a mandatory flock */
-#define LOCK_READ	64	/* ... Which allows concurrent read operations */
-#define LOCK_WRITE	128	/* ... Which allows concurrent write operations */
-#define LOCK_RW		192	/* ... Which allows concurrent read & write ops */
-#endif
-#endif
-
 #define MAX_SEC_CTX_DEPTH 8    /* Maximum number of security contexts */
 
 
@@ -690,11 +661,6 @@ void exit_server(const char *const reason) _NORETURN_;
 void exit_server_cleanly(const char *const reason) _NORETURN_;
 void exit_server_fault(void) _NORETURN_;
 
-#if defined(HAVE_IPV6)
-void in6_addr_to_sockaddr_storage(struct sockaddr_storage *ss,
-				  struct in6_addr ip);
-#endif
-
 /* samba3 doesn't use uwrap yet */
 #define uwrap_enabled() 0
 
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 827a9db..57de387 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1701,4 +1701,20 @@ struct deferred_open_record;
 /* Used inside aio code. */
 struct aio_extra;
 
+/*
+ * Reasons for cache flush.
+ */
+
+enum flush_reason_enum {
+    SEEK_FLUSH,
+    READ_FLUSH,
+    WRITE_FLUSH,
+    READRAW_FLUSH,
+    OPLOCK_RELEASE_FLUSH,
+    CLOSE_FLUSH,
+    SYNC_FLUSH,
+    SIZECHANGE_FLUSH,
+    /* NUM_FLUSH_REASONS must remain the last value in the enumeration. */
+    NUM_FLUSH_REASONS};
+
 #endif /* _SMB_H */
diff --git a/source3/lib/system.c b/source3/lib/system.c
index b6cc7a8..74a8971 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -833,6 +833,15 @@ FILE *sys_fopen(const char *path, const char *type)
 }
 
 
+#if HAVE_KERNEL_SHARE_MODES
+#ifndef LOCK_MAND
+#define LOCK_MAND	32	/* This is a mandatory flock */
+#define LOCK_READ	64	/* ... Which allows concurrent read operations */
+#define LOCK_WRITE	128	/* ... Which allows concurrent write operations */
+#define LOCK_RW		192	/* ... Which allows concurrent read & write ops */
+#endif
+#endif
+
 /*******************************************************************
  A flock() wrapper that will perform the kernel flock.
 ********************************************************************/


-- 
Samba Shared Repository