diff options
| -rw-r--r-- | source3/modules/gpfs.c | 23 | ||||
| -rw-r--r-- | source3/modules/vfs_gpfs.c | 4 | ||||
| -rw-r--r-- | source3/modules/vfs_gpfs.h | 3 |
3 files changed, 14 insertions, 16 deletions
diff --git a/source3/modules/gpfs.c b/source3/modules/gpfs.c index e042a8993a..2b12bbe969 100644 --- a/source3/modules/gpfs.c +++ b/source3/modules/gpfs.c @@ -31,7 +31,7 @@ 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, - int *buflen); + int *len); static int (*gpfs_set_winattrs_path_fn)(char *pathname, int flags, struct gpfs_winattr *attrs); static int (*gpfs_get_winattrs_path_fn)(char *pathname, struct gpfs_winattr *attrs); static int (*gpfs_get_winattrs_fn)(int fd, struct gpfs_winattr *attrs); @@ -116,6 +116,16 @@ 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) +{ + if (gpfs_get_realfilename_path_fn == NULL) { + errno = ENOSYS; + return -1; + } + + return gpfs_get_realfilename_path_fn(pathname, filenamep, len); +} + bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask, uint32 share_access) { @@ -191,17 +201,6 @@ int smbd_gpfs_ftruncate(int fd, gpfs_off64_t length) return gpfs_ftruncate_fn(fd, length); } -int smbd_gpfs_get_realfilename_path(char *pathname, char *filenamep, - int *buflen) -{ - if (gpfs_get_realfilename_path_fn == NULL) { - errno = ENOSYS; - return -1; - } - - return gpfs_get_realfilename_path_fn(pathname, filenamep, buflen); -} - int get_gpfs_winattrs(char *pathname,struct gpfs_winattr *attrs) { if (gpfs_get_winattrs_path_fn == NULL) { diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index a461fb3a11..52b2857fd5 100644 --- a/source3/modules/vfs_gpfs.c +++ b/source3/modules/vfs_gpfs.c @@ -181,8 +181,8 @@ static int vfs_gpfs_get_real_filename(struct vfs_handle_struct *handle, buflen = sizeof(real_pathname) - 1; - result = smbd_gpfs_get_realfilename_path(full_path, real_pathname, - &buflen); + result = gpfswrap_get_realfilename_path(full_path, real_pathname, + &buflen); TALLOC_FREE(full_path); diff --git a/source3/modules/vfs_gpfs.h b/source3/modules/vfs_gpfs.h index 7f5d70cd57..3b4037c722 100644 --- a/source3/modules/vfs_gpfs.h +++ b/source3/modules/vfs_gpfs.h @@ -32,11 +32,10 @@ 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); bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask, uint32 share_access); int set_gpfs_lease(int fd, int leasetype); -int smbd_gpfs_get_realfilename_path(char *pathname, char *filenamep, - int *buflen); int smbd_fget_gpfs_winattrs(int fd, struct gpfs_winattr *attrs); int get_gpfs_winattrs(char * pathname,struct gpfs_winattr *attrs); int set_gpfs_winattrs(char * pathname,int flags,struct gpfs_winattr *attrs); |