The branch, master has been updated
via 6be818b47b9 vfs_gpfs: Remove discard_const_p() from
gpfswrap_quotactl() calls
via ea45cba9ee2 vfs_gpfs: Remove discard_const_p() from gpfs_putacl()
calls
via 508ae8ee7a2 vfs_gpfs: Remove discard_const_p() from
gpfswrap_quotactl() calls
via bb0b31715f5 gpfswrap: Make pathname "const char *" in
gpfswrap_quotactl()
via 5d4ec2d722b gpfswrap: Make pathname "const char *" in
gpfswrap_get_winattrs_path()
via 27a725f4553 gpfswrap: Make pathname "const char *" in
gpfswrap_set_winattrs_path()
via 91be03a780e gpfswrap: Make pathname "const char *" in
gpfswrap_get_realfilename_path()
via 4833f173359 gpfswrap: Make pathname "const char *" in
gpfswrap_putacl()
via 3630ae2208d gpfswrap: Make pathname "const char *" in
gpfswrap_getacl()
via 18c26641342 gpfswrap: Remove unused wrapper gpfswrap_getfilesetid()
from f699df32cdb script/release.sh: Don't use quotations any longer.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6be818b47b934449d4a40973e4b81654ee22490b
Author: Ralph Wuerthner <ralph.wuerth...@de.ibm.com>
Date: Tue Jan 28 15:42:03 2020 +0100
vfs_gpfs: Remove discard_const_p() from gpfswrap_quotactl() calls
Signed-off-by: Ralph Wuerthner <ralph.wuerth...@de.ibm.com>
Reviewed-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
Autobuild-User(master): Christof Schmitt <c...@samba.org>
Autobuild-Date(master): Mon Feb 3 21:53:05 UTC 2020 on sn-devel-184
commit ea45cba9ee27e17182d440cd37e0c1cdf33b12f5
Author: Ralph Wuerthner <ralph.wuerth...@de.ibm.com>
Date: Tue Jan 28 15:40:46 2020 +0100
vfs_gpfs: Remove discard_const_p() from gpfs_putacl() calls
Signed-off-by: Ralph Wuerthner <ralph.wuerth...@de.ibm.com>
Reviewed-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit 508ae8ee7a25eb39a3b5788f0b90cc1e91629e6b
Author: Ralph Wuerthner <ralph.wuerth...@de.ibm.com>
Date: Tue Jan 28 15:33:47 2020 +0100
vfs_gpfs: Remove discard_const_p() from gpfswrap_quotactl() calls
Signed-off-by: Ralph Wuerthner <ralph.wuerth...@de.ibm.com>
Reviewed-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit bb0b31715f51d81c3d9cb065be36f1a629ab26dd
Author: Ralph Wuerthner <ralph.wuerth...@de.ibm.com>
Date: Tue Jan 28 14:50:19 2020 +0100
gpfswrap: Make pathname "const char *" in gpfswrap_quotactl()
Update wrapper function to match the definition in gpfs.h.
Signed-off-by: Ralph Wuerthner <ralph.wuerth...@de.ibm.com>
Reviewed-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit 5d4ec2d722b4820fd89307733afbb404fa038cc3
Author: Ralph Wuerthner <ralph.wuerth...@de.ibm.com>
Date: Tue Jan 28 14:46:43 2020 +0100
gpfswrap: Make pathname "const char *" in gpfswrap_get_winattrs_path()
Update wrapper function to match the definition in gpfs.h.
Signed-off-by: Ralph Wuerthner <ralph.wuerth...@de.ibm.com>
Reviewed-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit 27a725f4553e18496e0dc7605014470315cb3738
Author: Ralph Wuerthner <ralph.wuerth...@de.ibm.com>
Date: Tue Jan 28 14:44:24 2020 +0100
gpfswrap: Make pathname "const char *" in gpfswrap_set_winattrs_path()
Update wrapper function to match the definition in gpfs.h.
Signed-off-by: Ralph Wuerthner <ralph.wuerth...@de.ibm.com>
Reviewed-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit 91be03a780eec4cac0c184b34a8b95f2b82269e7
Author: Ralph Wuerthner <ralph.wuerth...@de.ibm.com>
Date: Tue Jan 28 14:42:01 2020 +0100
gpfswrap: Make pathname "const char *" in gpfswrap_get_realfilename_path()
Update wrapper function to match the definition in gpfs.h.
Signed-off-by: Ralph Wuerthner <ralph.wuerth...@de.ibm.com>
Reviewed-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit 4833f173359fb04fba42eb0c811b230238668f22
Author: Ralph Wuerthner <ralph.wuerth...@de.ibm.com>
Date: Tue Jan 28 14:39:51 2020 +0100
gpfswrap: Make pathname "const char *" in gpfswrap_putacl()
Update wrapper function to match the definition in gpfs.h.
Signed-off-by: Ralph Wuerthner <ralph.wuerth...@de.ibm.com>
Reviewed-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit 3630ae2208db1847aa91aeb08c76d3c2bdd2a1da
Author: Ralph Wuerthner <ralph.wuerth...@de.ibm.com>
Date: Tue Jan 28 14:34:55 2020 +0100
gpfswrap: Make pathname "const char *" in gpfswrap_getacl()
Update wrapper function to match the definition in gpfs.h.
Signed-off-by: Ralph Wuerthner <ralph.wuerth...@de.ibm.com>
Reviewed-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit 18c266413425408862fe2c17b153d4142ba86722
Author: Ralph Wuerthner <ralph.wuerth...@de.ibm.com>
Date: Fri Jan 31 09:51:27 2020 +0100
gpfswrap: Remove unused wrapper gpfswrap_getfilesetid()
Signed-off-by: Ralph Wuerthner <ralph.wuerth...@de.ibm.com>
Reviewed-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
lib/util/gpfswrap.c | 45 +++++++++++++++++++++------------------------
lib/util/gpfswrap.h | 17 ++++++++++-------
source3/modules/vfs_gpfs.c | 13 ++++++-------
3 files changed, 37 insertions(+), 38 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/gpfswrap.c b/lib/util/gpfswrap.c
index 7bc2ec06c15..14118cbf53c 100644
--- a/lib/util/gpfswrap.c
+++ b/lib/util/gpfswrap.c
@@ -23,23 +23,27 @@
static int (*gpfs_set_share_fn)(int fd, unsigned int allow, unsigned int deny);
static int (*gpfs_set_lease_fn)(int fd, unsigned int type);
-static int (*gpfs_getacl_fn)(char *pathname, int flags, void *acl);
-static int (*gpfs_putacl_fn)(char *pathname, int flags, void *acl);
-static int (*gpfs_get_realfilename_path_fn)(char *pathname, char *filenamep,
+static int (*gpfs_getacl_fn)(const char *pathname, int flags, void *acl);
+static int (*gpfs_putacl_fn)(const char *pathname, int flags, void *acl);
+static int (*gpfs_get_realfilename_path_fn)(const char *pathname,
+ char *filenamep,
int *len);
-static int (*gpfs_set_winattrs_path_fn)(char *pathname, int flags,
+static int (*gpfs_set_winattrs_path_fn)(const char *pathname,
+ int flags,
struct gpfs_winattr *attrs);
static int (*gpfs_set_winattrs_fn)(int fd, int flags,
struct gpfs_winattr *attrs);
-static int (*gpfs_get_winattrs_path_fn)(char *pathname,
+static int (*gpfs_get_winattrs_path_fn)(const char *pathname,
struct gpfs_winattr *attrs);
static int (*gpfs_get_winattrs_fn)(int fd, struct gpfs_winattr *attrs);
static int (*gpfs_ftruncate_fn)(int fd, gpfs_off64_t length);
static int (*gpfs_lib_init_fn)(int flags);
static int (*gpfs_set_times_path_fn)(char *pathname, int flags,
gpfs_timestruc_t times[4]);
-static int (*gpfs_quotactl_fn)(char *pathname, int cmd, int id, void *bufp);
-static int (*gpfs_getfilesetid_fn)(char *pathname, char *name, int *idp);
+static int (*gpfs_quotactl_fn)(const char *pathname,
+ int cmd,
+ int id,
+ void *bufp);
static int (*gpfs_init_trace_fn)(void);
static int (*gpfs_query_trace_fn)(void);
static void (*gpfs_add_trace_fn)(int level, const char *msg);
@@ -75,7 +79,6 @@ int gpfswrap_init(void)
gpfs_lib_init_fn = dlsym(l, "gpfs_lib_init");
gpfs_set_times_path_fn = dlsym(l, "gpfs_set_times_path");
gpfs_quotactl_fn = dlsym(l, "gpfs_quotactl");
- gpfs_getfilesetid_fn = dlsym(l, "gpfs_getfilesetid");
gpfs_init_trace_fn = dlsym(l, "gpfs_init_trace");
gpfs_query_trace_fn = dlsym(l, "gpfs_query_trace");
gpfs_add_trace_fn = dlsym(l, "gpfs_add_trace");
@@ -106,7 +109,7 @@ int gpfswrap_set_lease(int fd, unsigned int type)
return gpfs_set_lease_fn(fd, type);
}
-int gpfswrap_getacl(char *pathname, int flags, void *acl)
+int gpfswrap_getacl(const char *pathname, int flags, void *acl)
{
if (gpfs_getacl_fn == NULL) {
errno = ENOSYS;
@@ -116,7 +119,7 @@ int gpfswrap_getacl(char *pathname, int flags, void *acl)
return gpfs_getacl_fn(pathname, flags, acl);
}
-int gpfswrap_putacl(char *pathname, int flags, void *acl)
+int gpfswrap_putacl(const char *pathname, int flags, void *acl)
{
if (gpfs_putacl_fn == NULL) {
errno = ENOSYS;
@@ -126,7 +129,9 @@ int gpfswrap_putacl(char *pathname, int flags, void *acl)
return gpfs_putacl_fn(pathname, flags, acl);
}
-int gpfswrap_get_realfilename_path(char *pathname, char *filenamep, int *len)
+int gpfswrap_get_realfilename_path(const char *pathname,
+ char *filenamep,
+ int *len)
{
if (gpfs_get_realfilename_path_fn == NULL) {
errno = ENOSYS;
@@ -136,7 +141,8 @@ int gpfswrap_get_realfilename_path(char *pathname, char
*filenamep, int *len)
return gpfs_get_realfilename_path_fn(pathname, filenamep, len);
}
-int gpfswrap_set_winattrs_path(char *pathname, int flags,
+int gpfswrap_set_winattrs_path(const char *pathname,
+ int flags,
struct gpfs_winattr *attrs)
{
if (gpfs_set_winattrs_path_fn == NULL) {
@@ -157,7 +163,8 @@ int gpfswrap_set_winattrs(int fd, int flags, struct
gpfs_winattr *attrs)
return gpfs_set_winattrs_fn(fd, flags, attrs);
}
-int gpfswrap_get_winattrs_path(char *pathname, struct gpfs_winattr *attrs)
+int gpfswrap_get_winattrs_path(const char *pathname,
+ struct gpfs_winattr *attrs)
{
if (gpfs_get_winattrs_path_fn == NULL) {
errno = ENOSYS;
@@ -208,7 +215,7 @@ int gpfswrap_set_times_path(char *pathname, int flags,
return gpfs_set_times_path_fn(pathname, flags, times);
}
-int gpfswrap_quotactl(char *pathname, int cmd, int id, void *bufp)
+int gpfswrap_quotactl(const char *pathname, int cmd, int id, void *bufp)
{
if (gpfs_quotactl_fn == NULL) {
errno = ENOSYS;
@@ -218,16 +225,6 @@ int gpfswrap_quotactl(char *pathname, int cmd, int id,
void *bufp)
return gpfs_quotactl_fn(pathname, cmd, id, bufp);
}
-int gpfswrap_getfilesetid(char *pathname, char *name, int *idp)
-{
- if (gpfs_getfilesetid_fn == NULL) {
- errno = ENOSYS;
- return -1;
- }
-
- return gpfs_getfilesetid_fn(pathname, name, idp);
-}
-
int gpfswrap_init_trace(void)
{
if (gpfs_init_trace_fn == NULL) {
diff --git a/lib/util/gpfswrap.h b/lib/util/gpfswrap.h
index 3141360a584..f62d690ac06 100644
--- a/lib/util/gpfswrap.h
+++ b/lib/util/gpfswrap.h
@@ -29,20 +29,23 @@
int gpfswrap_init(void);
int gpfswrap_set_share(int fd, unsigned int allow, unsigned int deny);
int gpfswrap_set_lease(int fd, unsigned int type);
-int gpfswrap_getacl(char *pathname, int flags, void *acl);
-int gpfswrap_putacl(char *pathname, int flags, void *acl);
-int gpfswrap_get_realfilename_path(char *pathname, char *filenamep, int *len);
-int gpfswrap_set_winattrs_path(char *pathname, int flags,
+int gpfswrap_getacl(const char *pathname, int flags, void *acl);
+int gpfswrap_putacl(const char *pathname, int flags, void *acl);
+int gpfswrap_get_realfilename_path(const char *pathname,
+ char *filenamep,
+ int *len);
+int gpfswrap_set_winattrs_path(const char *pathname,
+ int flags,
struct gpfs_winattr *attrs);
int gpfswrap_set_winattrs(int fd, int flags, struct gpfs_winattr *attrs);
-int gpfswrap_get_winattrs_path(char *pathname, struct gpfs_winattr *attrs);
+int gpfswrap_get_winattrs_path(const char *pathname,
+ struct gpfs_winattr *attrs);
int gpfswrap_get_winattrs(int fd, struct gpfs_winattr *attrs);
int gpfswrap_ftruncate(int fd, gpfs_off64_t length);
int gpfswrap_lib_init(int flags);
int gpfswrap_set_times_path(char *pathname, int flags,
gpfs_timestruc_t times[4]);
-int gpfswrap_quotactl(char *pathname, int cmd, int id, void *bufp);
-int gpfswrap_getfilesetid(char *pathname, char *name, int *idp);
+int gpfswrap_quotactl(const char *pathname, int cmd, int id, void *bufp);
int gpfswrap_init_trace(void);
int gpfswrap_query_trace(void);
void gpfswrap_add_trace(int level, const char *msg);
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 1c843db503d..115459bd15d 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -417,7 +417,7 @@ static int gpfs_getacl_with_capability(const char *fname,
int flags, void *buf)
set_effective_capability(DAC_OVERRIDE_CAPABILITY);
- ret = gpfswrap_getacl(discard_const_p(char, fname), flags, buf);
+ ret = gpfswrap_getacl(fname, flags, buf);
saved_errno = errno;
drop_effective_capability(DAC_OVERRIDE_CAPABILITY);
@@ -478,8 +478,7 @@ again:
if (use_capability) {
ret = gpfs_getacl_with_capability(fname, flags, aclbuf);
} else {
- ret = gpfswrap_getacl(discard_const_p(char, fname),
- flags, aclbuf);
+ ret = gpfswrap_getacl(fname, flags, aclbuf);
if ((ret != 0) && (errno == EACCES)) {
DBG_DEBUG("Retry with DAC capability for %s\n", fname);
use_capability = true;
@@ -1326,8 +1325,9 @@ static int gpfsacl_sys_acl_set_file(vfs_handle_struct
*handle,
return -1;
}
- result = gpfswrap_putacl(discard_const_p(char, smb_fname->base_name),
- GPFS_PUTACL_STRUCT|GPFS_ACL_SAMBA, gpfs_acl);
+ result = gpfswrap_putacl(smb_fname->base_name,
+ GPFS_PUTACL_STRUCT|GPFS_ACL_SAMBA,
+ gpfs_acl);
SAFE_FREE(gpfs_acl);
return result;
@@ -2310,8 +2310,7 @@ static int get_gpfs_quota(const char *pathname, int type,
int id,
{
int ret;
- ret = gpfswrap_quotactl(discard_const_p(char, pathname),
- GPFS_QCMD(Q_GETQUOTA, type), id, qi);
+ ret = gpfswrap_quotactl(pathname, GPFS_QCMD(Q_GETQUOTA, type), id, qi);
if (ret) {
if (errno == GPFS_E_NO_QUOTA_INST) {
--
Samba Shared Repository
