gpfs: Rename wrapper for gpfs_putacl

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>

diff --git a/source3/modules/gpfs.c b/source3/modules/gpfs.c
index de66a1e32ce93b6e8844d67b085baacadb184ba2..e042a8993a5108f58ec7d03702b91d126d70f1dd 100644 (file)
--- a/source3/modules/gpfs.c
+++ b/source3/modules/gpfs.c
@@ -106,6 +106,16 @@ 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)
+{
+       if (gpfs_putacl_fn == NULL) {
+               errno = ENOSYS;
+               return -1;
+       }
+
+       return gpfs_putacl_fn(pathname, flags, acl);
+}
+
 bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask,
                        uint32 share_access)
 {
@@ -171,16 +181,6 @@ int set_gpfs_lease(int fd, int leasetype)
        return gpfswrap_set_lease(fd, gpfs_type);
 }
 
-int smbd_gpfs_putacl(char *pathname, int flags, void *acl)
-{
-       if (gpfs_putacl_fn == NULL) {
-               errno = ENOSYS;
-               return -1;
-       }
-
-       return gpfs_putacl_fn(pathname, flags, acl);
-}
-
 int smbd_gpfs_ftruncate(int fd, gpfs_off64_t length)
 {
        if (gpfs_ftruncate_fn == NULL) {

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 79c0e2cd306965e57f8b71b3edd60daf1c1ae6d0..a461fb3a114ffa17009724c8a6c6e6d257deb129 100644 (file)
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -646,8 +646,8 @@ static bool gpfsacl_process_smbacl(vfs_handle_struct *handle,
        if (gacl == NULL) { /* out of memory */
                return False;
        }
-       ret = smbd_gpfs_putacl(fsp->fsp_name->base_name,
-                              GPFS_PUTACL_STRUCT | GPFS_ACL_SAMBA, gacl);
+       ret = gpfswrap_putacl(fsp->fsp_name->base_name,
+                             GPFS_PUTACL_STRUCT | GPFS_ACL_SAMBA, gacl);
 
        if ((ret != 0) && (errno == EINVAL)) {
                DEBUG(10, ("Retry without nfs41 control flags\n"));
@@ -656,9 +656,9 @@ static bool gpfsacl_process_smbacl(vfs_handle_struct *handle,
                if (gacl == NULL) { /* out of memory */
                        return False;
                }
-               ret = smbd_gpfs_putacl(fsp->fsp_name->base_name,
-                                      GPFS_PUTACL_STRUCT | GPFS_ACL_SAMBA,
-                                      gacl);
+               ret = gpfswrap_putacl(fsp->fsp_name->base_name,
+                                     GPFS_PUTACL_STRUCT | GPFS_ACL_SAMBA,
+                                     gacl);
        }
 
        if (ret != 0) {
@@ -1127,8 +1127,8 @@ static int gpfsacl_sys_acl_set_file(vfs_handle_struct *handle,
                return -1;
        }
 
-       result = smbd_gpfs_putacl(discard_const_p(char, name),
-                                 GPFS_PUTACL_STRUCT|GPFS_ACL_SAMBA, gpfs_acl);
+       result = gpfswrap_putacl(discard_const_p(char, name),
+                                GPFS_PUTACL_STRUCT|GPFS_ACL_SAMBA, gpfs_acl);
 
        SAFE_FREE(gpfs_acl);
        return result;

diff --git a/source3/modules/vfs_gpfs.h b/source3/modules/vfs_gpfs.h
index 83b54c5df5563fb95e3e622b56596ce63c12ae9b..7f5d70cd57436f179d80e098cadb8136706cfc93 100644 (file)
--- a/source3/modules/vfs_gpfs.h
+++ b/source3/modules/vfs_gpfs.h
@@ -31,10 +31,10 @@ 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);
 bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask,
                        uint32 share_access);
 int set_gpfs_lease(int fd, int leasetype);
-int smbd_gpfs_putacl(char *pathname, int flags, void *acl);
 int smbd_gpfs_get_realfilename_path(char *pathname, char *filenamep,
                                    int *buflen);
 int smbd_fget_gpfs_winattrs(int fd, struct gpfs_winattr *attrs);