[SCM] Samba Shared Repository - branch master updated

2015-09-07 Thread Volker Lendecke 
The branch, master has been updated
   via  e79877a ctdb-tools: Add dbstatistics to ctdb_diagnostics
   via  bce6a38 ctdb-daemon: Drop struct ctdb_control_killtcp
  from  2a8b21e vfs_gpfs: Avoid calling gpfs_is_offline on every i/o

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


- Log -
commit e79877a230ebccee71609ef8ec7af4323875668d
Author: Martin Schwenke 
Date:   Sun Aug 16 13:26:21 2015 +1000

ctdb-tools: Add dbstatistics to ctdb_diagnostics

Signed-off-by: Martin Schwenke 
Reviewed-by: Volker Lendecke 

Autobuild-User(master): Volker Lendecke 
Autobuild-Date(master): Mon Sep  7 10:00:54 CEST 2015 on sn-devel-104

commit bce6a386d3e231613c2a08094d8460f78ac9183e
Author: Martin Schwenke 
Date:   Mon Mar 23 16:10:51 2015 +1100

ctdb-daemon: Drop struct ctdb_control_killtcp

Just use ctdb_tcp_connection.  It is the same.  There are no external
users.

Signed-off-by: Martin Schwenke 
Reviewed-by: Volker Lendecke 

---

Summary of changes:
 ctdb/client/ctdb_client.c   |  4 ++--
 ctdb/include/ctdb_private.h | 10 +-
 ctdb/server/ctdb_control.c  |  2 +-
 ctdb/server/ctdb_takeover.c |  2 +-
 ctdb/tools/ctdb.c   |  8 
 ctdb/tools/ctdb_diagnostics |  1 +
 6 files changed, 10 insertions(+), 17 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index 3383c57..9c7571f 100644
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -3071,13 +3071,13 @@ int ctdb_ctrl_del_public_ip(struct ctdb_context *ctdb,
 int ctdb_ctrl_killtcp(struct ctdb_context *ctdb, 
  struct timeval timeout, 
  uint32_t destnode,
- struct ctdb_control_killtcp *killtcp)
+ struct ctdb_tcp_connection *killtcp)
 {
TDB_DATA data;
int32_t res;
int ret;
 
-   data.dsize = sizeof(struct ctdb_control_killtcp);
+   data.dsize = sizeof(struct ctdb_tcp_connection);
data.dptr  = (unsigned char *)killtcp;
 
ret = ctdb_control(ctdb, destnode, 0, CTDB_CONTROL_KILL_TCP, 0, data, 
NULL,
diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index 1d91923..42b87ca 100644
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -608,14 +608,6 @@ struct ctdb_db_context {
  }} while (0)
 
 /*
-  struct for kill_tcp control
- */
-struct ctdb_control_killtcp {
-   ctdb_sock_addr src_addr;
-   ctdb_sock_addr dst_addr;
-};
-
-/*
   struct holding a ctdb_sock_addr and an interface name,
   used to add/remove public addresses
  */
@@ -1215,7 +1207,7 @@ int ctdb_sys_read_tcp_packet(int s, void *private_data, 
ctdb_sock_addr *src, ctd
 int ctdb_ctrl_killtcp(struct ctdb_context *ctdb, 
  struct timeval timeout, 
  uint32_t destnode,
- struct ctdb_control_killtcp *killtcp);
+ struct ctdb_tcp_connection *killtcp);
 
 int ctdb_ctrl_add_public_ip(struct ctdb_context *ctdb, 
  struct timeval timeout, 
diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c
index ee69270..2335f06 100644
--- a/ctdb/server/ctdb_control.c
+++ b/ctdb/server/ctdb_control.c
@@ -403,7 +403,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context 
*ctdb,
return ctdb_control_modflags(ctdb, indata);
 
case CTDB_CONTROL_KILL_TCP: 
-   CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_control_killtcp));
+   CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_tcp_connection));
return ctdb_control_kill_tcp(ctdb, indata);
 
case CTDB_CONTROL_GET_TCP_TICKLE_LIST:
diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index efc80b1..2f4874b 100644
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -3714,7 +3714,7 @@ failed:
  */
 int32_t ctdb_control_kill_tcp(struct ctdb_context *ctdb, TDB_DATA indata)
 {
-   struct ctdb_control_killtcp *killtcp = (struct ctdb_control_killtcp 
*)indata.dptr;
+   struct ctdb_tcp_connection *killtcp = (struct ctdb_tcp_connection 
*)indata.dptr;
 
return ctdb_killtcp_add_connection(ctdb, >src_addr, 
>dst_addr);
 }
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 1081eec..69f881f 100644
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -2606,7 +2606,7 @@ static int control_delip(struct ctdb_context *ctdb, int 
argc, const char **argv)
 static int kill_tcp_from_file(struct ctdb_context *ctdb,
  int argc, const char **argv)
 {
-   struct ctdb_control_killtcp *killtcp;
+   struct ctdb_tcp_connection *killtcp;
int

[SCM] Samba Shared Repository - branch master updated

2015-09-07 Thread Michael Adam 
The branch, master has been updated
   via  a7b6dd4 libsmbclient: Fix 32-bit problems
  from  e79877a ctdb-tools: Add dbstatistics to ctdb_diagnostics

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


- Log -
commit a7b6dd4f2f0583e24dff139f6f8e6a707585456d
Author: Volker Lendecke 
Date:   Fri Sep 4 16:40:25 2015 +0200

libsmbclient: Fix 32-bit problems

Signed-off-by: Volker Lendecke 
Reviewed-by: Michael Adam 

Autobuild-User(master): Michael Adam 
Autobuild-Date(master): Mon Sep  7 15:13:08 CEST 2015 on sn-devel-104

---

Summary of changes:
 examples/libsmbclient/teststat.c  | 16 
 examples/libsmbclient/teststat2.c | 16 
 examples/libsmbclient/testutime.c | 16 
 3 files changed, 24 insertions(+), 24 deletions(-)


Changeset truncated at 500 lines:

diff --git a/examples/libsmbclient/teststat.c b/examples/libsmbclient/teststat.c
index f36639e..4084fd0 100644
--- a/examples/libsmbclient/teststat.c
+++ b/examples/libsmbclient/teststat.c
@@ -47,10 +47,10 @@ int main(int argc, char * argv[])
 return 1;
 }
 
-printf("\nSAMBA\n mtime:%lu/%s ctime:%lu/%s atime:%lu/%s\n",
-   st.st_mtime, ctime_r(_mtime, m_time),
-   st.st_ctime, ctime_r(_ctime, c_time),
-   st.st_atime, ctime_r(_atime, a_time)); 
+printf("\nSAMBA\n mtime:%lld/%s ctime:%lld/%s atime:%lld/%s\n",
+   (long long)st.st_mtime, ctime_r(_mtime, m_time),
+   (long long)st.st_ctime, ctime_r(_ctime, c_time),
+   (long long)st.st_atime, ctime_r(_atime, a_time));
 
 if (pLocalPath != NULL)
 {
@@ -60,10 +60,10 @@ int main(int argc, char * argv[])
 return 1;
 }
 
-printf("LOCAL\n mtime:%lu/%s ctime:%lu/%s atime:%lu/%s\n",
-   st.st_mtime, ctime_r(_mtime, m_time),
-   st.st_ctime, ctime_r(_ctime, c_time),
-   st.st_atime, ctime_r(_atime, a_time)); 
+printf("LOCAL\n mtime:%lld/%s ctime:%lld/%s atime:%lld/%s\n",
+   (long long)st.st_mtime, ctime_r(_mtime, m_time),
+   (long long)st.st_ctime, ctime_r(_ctime, c_time),
+   (long long)st.st_atime, ctime_r(_atime, a_time));
 }
 
 return 0; 
diff --git a/examples/libsmbclient/teststat2.c 
b/examples/libsmbclient/teststat2.c
index fcd3e30..963cd27 100644
--- a/examples/libsmbclient/teststat2.c
+++ b/examples/libsmbclient/teststat2.c
@@ -47,10 +47,10 @@ static int gettime(const char * pUrl,
 return 1;
 }
 
-printf("SAMBA\n mtime:%lu/%s ctime:%lu/%s atime:%lu/%s\n",
-   st.st_mtime, ctime_r(_mtime, m_time),
-   st.st_ctime, ctime_r(_ctime, c_time),
-   st.st_atime, ctime_r(_atime, a_time)); 
+printf("SAMBA\n mtime:%lld/%s ctime:%lld/%s atime:%lld/%s\n",
+   (long long)st.st_mtime, ctime_r(_mtime, m_time),
+   (long long)st.st_ctime, ctime_r(_ctime, c_time),
+   (long long)st.st_atime, ctime_r(_atime, a_time));
 
 
 /* check the stat on this file */
@@ -60,10 +60,10 @@ static int gettime(const char * pUrl,
 return 1;
 }
 
-printf("LOCAL\n mtime:%lu/%s ctime:%lu/%s atime:%lu/%s\n",
-   st.st_mtime, ctime_r(_mtime, m_time),
-   st.st_ctime, ctime_r(_ctime, c_time),
-   st.st_atime, ctime_r(_atime, a_time));
+printf("LOCAL\n mtime:%lld/%s ctime:%lld/%s atime:%lld/%s\n",
+   (long long)st.st_mtime, ctime_r(_mtime, m_time),
+   (long long)st.st_ctime, ctime_r(_ctime, c_time),
+   (long long)st.st_atime, ctime_r(_atime, a_time));
 
 
 return 0;
diff --git a/examples/libsmbclient/testutime.c 
b/examples/libsmbclient/testutime.c
index 2b3c40b..cdbcfec 100644
--- a/examples/libsmbclient/testutime.c
+++ b/examples/libsmbclient/testutime.c
@@ -47,10 +47,10 @@ int main(int argc, char * argv[])
 return 1;
 }
 
-printf("Before\n mtime:%lu/%s ctime:%lu/%s atime:%lu/%s\n",
-   st.st_mtime, ctime_r(_mtime, m_time),
-   st.st_ctime, ctime_r(_ctime, c_time),
-   st.st_atime, ctime_r(_atime, a_time)); 
+printf("Before\n mtime:%lld/%s ctime:%lld/%s atime:%lld/%s\n",
+   (long long)st.st_mtime, ctime_r(_mtime, m_time),
+   (long long)st.st_ctime, ctime_r(_ctime, c_time),
+   (long long)st.st_atime, ctime_r(_atime, a_time));
 
 utimbuf.actime = t; /* unchangable (wont change) */
 utimbuf.modtime = t;/* this one should succeed */
@@ -66,10 +66,10 @@ int main(int argc, char * argv[])
 return 1;
 }
 
-printf("After\n mtime:%lu/%s ctime:%lu/%s