sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

gpfs: Rename wrapper for gpfs_set_winattrs_path

Browse Source 
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
This commit is contained in:
Christof Schmitt 2014-12-10 15:22:27 -07:00
parent fdd6078ddd
commit e9e87d456a
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source3/modules/gpfs.c
View File

@ -32,7 +32,8 @@ 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 *len);
static int (*gpfs_set_winattrs_path_fn)(char *pathname, int flags, struct gpfs_winattr *attrs);
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);
static int (*gpfs_prealloc_fn)(int fd, gpfs_off64_t startOffset, gpfs_off64_t bytesToPrealloc);
@ -126,6 +127,17 @@ 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,
struct gpfs_winattr *attrs)
{
if (gpfs_set_winattrs_path_fn == NULL) {
errno = ENOSYS;
return -1;
}
return gpfs_set_winattrs_path_fn(pathname, flags, attrs);
}
bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask,
uint32 share_access)
{
@ -231,17 +243,6 @@ int smbd_gpfs_prealloc(int fd, gpfs_off64_t start, gpfs_off64_t bytes)
return gpfs_prealloc_fn(fd, start, bytes);
}
int set_gpfs_winattrs(char *pathname,int flags,struct gpfs_winattr *attrs)
{
if (gpfs_set_winattrs_path_fn == NULL) {
errno = ENOSYS;
return -1;
}
DEBUG(10, ("gpfs_set_winattrs_path:open call %s\n",pathname));
return gpfs_set_winattrs_path_fn(pathname,flags, attrs);
}
int get_gpfs_quota(const char *pathname, int type, int id,
struct gpfs_quotaInfo *qi)
{

9
source3/modules/vfs_gpfs.c
View File

@ -1425,8 +1425,8 @@ static int gpfs_set_xattr(struct vfs_handle_struct *handle, const char *path,
}
ret = set_gpfs_winattrs(discard_const_p(char, path),
GPFS_WINATTR_SET_ATTRS, &attrs);
ret = gpfswrap_set_winattrs_path(discard_const_p(char, path),
GPFS_WINATTR_SET_ATTRS, &attrs);
if ( ret == -1){
if (errno == ENOSYS) {
return SMB_VFS_NEXT_SETXATTR(handle, path, name, value,
@ -1726,8 +1726,9 @@ static int vfs_gpfs_ntimes(struct vfs_handle_struct *handle,
attrs.creationTime.tv_sec = ft->create_time.tv_sec;
attrs.creationTime.tv_nsec = ft->create_time.tv_nsec;
ret = set_gpfs_winattrs(discard_const_p(char, path),
GPFS_WINATTR_SET_CREATION_TIME, &attrs);
ret = gpfswrap_set_winattrs_path(discard_const_p(char, path),
GPFS_WINATTR_SET_CREATION_TIME,
&attrs);
if(ret == -1 && errno != ENOSYS){
DEBUG(1,("vfs_gpfs_ntimes: set GPFS ntimes failed %d\n",ret));
return -1;

3
source3/modules/vfs_gpfs.h
View File

@ -33,12 +33,13 @@ 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,
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 get_gpfs_winattrs(char * pathname,struct gpfs_winattr *attrs);
int set_gpfs_winattrs(char * pathname,int flags,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,