diff options
| author | Christof Schmitt <cs@samba.org> | 2014-12-10 15:34:59 -0700 |
|---|---|---|
| committer | Christof Schmitt <cs@samba.org> | 2015-03-02 22:31:08 +0100 |
| commit | db01831082f3120649d742b21aaff9c90fd3cdf0 (patch) | |
| tree | a744d8f4bc0563c2c4e98d1932db73857eb2e46e /source3 | |
| parent | eefb916192d7e58c21bee35ef3420a4b3f0a3ae0 (diff) | |
| download | samba-db01831082f3120649d742b21aaff9c90fd3cdf0.tar.gz samba-db01831082f3120649d742b21aaff9c90fd3cdf0.tar.xz samba-db01831082f3120649d742b21aaff9c90fd3cdf0.zip | |
gpfs: Rename wrapper for gpfs_lib_init
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/modules/gpfs.c | 21 | ||||
| -rw-r--r-- | source3/modules/vfs_gpfs.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_gpfs.h | 3 |
3 files changed, 12 insertions, 14 deletions
diff --git a/source3/modules/gpfs.c b/source3/modules/gpfs.c index f67b38c5f0..b90d42292e 100644 --- a/source3/modules/gpfs.c +++ b/source3/modules/gpfs.c @@ -179,6 +179,16 @@ int gpfswrap_ftruncate(int fd, gpfs_off64_t length) return gpfs_ftruncate_fn(fd, length); } +int gpfswrap_lib_init(int flags) +{ + if (gpfs_lib_init_fn == NULL) { + errno = ENOSYS; + return -1; + } + + return gpfs_lib_init_fn(flags); +} + bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask, uint32 share_access) { @@ -323,17 +333,6 @@ int get_gpfs_fset_id(const char *pathname, int *fset_id) return err; } -void smbd_gpfs_lib_init() -{ - if (gpfs_lib_init_fn) { - int rc = gpfs_lib_init_fn(0); - DEBUG(10, ("gpfs_lib_init() finished with rc %d " - "and errno %d\n", rc, errno)); - } else { - DEBUG(10, ("libgpfs lacks gpfs_lib_init\n")); - } -} - static void timespec_to_gpfs_time(struct timespec ts, gpfs_timestruc_t *gt, int idx, int *flags) { diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index 03cded11bc..883894d5a4 100644 --- a/source3/modules/vfs_gpfs.c +++ b/source3/modules/vfs_gpfs.c @@ -1858,7 +1858,7 @@ static int vfs_gpfs_connect(struct vfs_handle_struct *handle, struct gpfs_config_data *config; int ret; - smbd_gpfs_lib_init(); + gpfswrap_lib_init(0); config = talloc_zero(handle->conn, struct gpfs_config_data); if (!config) { diff --git a/source3/modules/vfs_gpfs.h b/source3/modules/vfs_gpfs.h index 3e040227e0..9d7ed542f3 100644 --- a/source3/modules/vfs_gpfs.h +++ b/source3/modules/vfs_gpfs.h @@ -39,6 +39,7 @@ int gpfswrap_get_winattrs_path(char *pathname, struct gpfs_winattr *attrs); int gpfswrap_get_winattrs(int fd, struct gpfs_winattr *attrs); int gpfswrap_prealloc(int fd, gpfs_off64_t start, gpfs_off64_t bytes); int gpfswrap_ftruncate(int fd, gpfs_off64_t length); +int gpfswrap_lib_init(int flags); bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask, uint32 share_access); int set_gpfs_lease(int fd, int leasetype); @@ -46,5 +47,3 @@ int get_gpfs_quota(const char *pathname, int type, int id, struct gpfs_quotaInfo *qi); int get_gpfs_fset_id(const char *pathname, int *fset_id); int smbd_gpfs_set_times_path(char *path, struct smb_file_time *ft); - -void smbd_gpfs_lib_init(void); |