gpfs: Rename wrapper for gpfs_get_winattrs

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 d0296039dbb2f7efcf90e61c1fee36d39263794a..bcf5d2498a9dac5bb4f67051768b2febf0136e4b 100644 (file)
--- a/source3/modules/gpfs.c
+++ b/source3/modules/gpfs.c
@@ -149,6 +149,16 @@ int gpfswrap_get_winattrs_path(char *pathname, struct gpfs_winattr *attrs)
        return gpfs_get_winattrs_path_fn(pathname, attrs);
 }
 
+int gpfswrap_get_winattrs(int fd, struct gpfs_winattr *attrs)
+{
+       if (gpfs_get_winattrs_fn == NULL) {
+               errno = ENOSYS;
+               return -1;
+       }
+
+       return gpfs_get_winattrs_fn(fd, attrs);
+}
+
 bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask,
                        uint32 share_access)
 {
@@ -224,16 +234,6 @@ int smbd_gpfs_ftruncate(int fd, gpfs_off64_t length)
        return gpfs_ftruncate_fn(fd, length);
 }
 
-int smbd_fget_gpfs_winattrs(int fd, struct gpfs_winattr *attrs)
-{
-       if (gpfs_get_winattrs_fn == NULL) {
-                errno = ENOSYS;
-                return -1;
-        }
-        DEBUG(10, ("gpfs_get_winattrs:open call %d\n", fd));
-        return gpfs_get_winattrs_fn(fd, attrs);
-}
-
 int smbd_gpfs_prealloc(int fd, gpfs_off64_t start, gpfs_off64_t bytes)
 {
        if (gpfs_prealloc_fn == NULL) {

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 34a2d044b0c2164359cd569ef51465d0ba0f9db5..a24f5d5406b6627dfb39b3f4a93e350248ae1153 100644 (file)
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -1616,7 +1616,7 @@ static int vfs_gpfs_fstat(struct vfs_handle_struct *handle,
                return 0;
        }
 
-       ret = smbd_fget_gpfs_winattrs(fsp->fh->fd, &attrs);
+       ret = gpfswrap_get_winattrs(fsp->fh->fd, &attrs);
        if (ret == 0) {
                sbuf->st_ex_calculated_birthtime = false;
                sbuf->st_ex_btime.tv_sec = attrs.creationTime.tv_sec;

diff --git a/source3/modules/vfs_gpfs.h b/source3/modules/vfs_gpfs.h
index afe2da4e76ef11e458827e0b8073132f42751af3..d4b584579f8a580316df1755ea73bb8ab584b39d 100644 (file)
--- a/source3/modules/vfs_gpfs.h
+++ b/source3/modules/vfs_gpfs.h
@@ -36,10 +36,10 @@ int gpfswrap_get_realfilename_path(char *pathname, char *filenamep, int *len);
 int gpfswrap_set_winattrs_path(char *pathname, int flags,
                               struct gpfs_winattr *attrs);
 int gpfswrap_get_winattrs_path(char *pathname, struct gpfs_winattr *attrs);
+int gpfswrap_get_winattrs(int fd, struct gpfs_winattr *attrs);
 bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask,
                        uint32 share_access);
 int set_gpfs_lease(int fd, int leasetype);
-int smbd_fget_gpfs_winattrs(int fd, struct gpfs_winattr *attrs);
 int smbd_gpfs_prealloc(int fd, gpfs_off64_t start, gpfs_off64_t bytes);
 int smbd_gpfs_ftruncate(int fd, gpfs_off64_t length);
 int get_gpfs_quota(const char *pathname, int type, int id,