sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

vfs_gpfs: Remove usage of gpfs_prealloc

Browse Source 
All supported versions of GPFS now support fallocate. Use the default
codepath instead of the API call. Keep the function stub as it will
be used for a check later.

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Christof Schmitt 2018-05-14 14:33:15 -07:00 committed by Jeremy Allison
parent ef35d4d8cd
commit 0b203d9447
1 changed files with 3 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
source3/modules/vfs_gpfs.c
View File

@ -48,7 +48,6 @@ struct gpfs_config_data {
bool ftruncate;
bool getrealfilename;
bool dfreequota;
bool prealloc;
bool acl;
bool settimes;
bool recalls;
@ -1944,40 +1943,10 @@ static int vfs_gpfs_ntimes(struct vfs_handle_struct *handle,
}
static int vfs_gpfs_fallocate(struct vfs_handle_struct *handle,
struct files_struct *fsp, uint32_t mode,
off_t offset, off_t len)
struct files_struct *fsp, uint32_t mode,
off_t offset, off_t len)
{
int ret;
struct gpfs_config_data *config;
SMB_VFS_HANDLE_GET_DATA(handle, config,
struct gpfs_config_data,
return -1);
if (!config->prealloc) {
/* you should better not run fallocate() on GPFS at all */
errno = ENOTSUP;
return -1;
}
if (mode != 0) {
DEBUG(10, ("unmapped fallocate flags: %lx\n",
(unsigned long)mode));
errno = ENOTSUP;
return -1;
}
ret = gpfswrap_prealloc(fsp->fh->fd, offset, len);
if (ret == -1 && errno != ENOSYS) {
DEBUG(0, ("GPFS prealloc failed: %s\n", strerror(errno)));
} else if (ret == -1 && errno == ENOSYS) {
DEBUG(10, ("GPFS prealloc not supported.\n"));
} else {
DEBUG(10, ("GPFS prealloc succeeded.\n"));
}
return ret;
return SMB_VFS_NEXT_FALLOCATE(handle, fsp, mode, offset, len);
}
static int vfs_gpfs_ftruncate(vfs_handle_struct *handle, files_struct *fsp,
@ -2152,9 +2121,6 @@ static int vfs_gpfs_connect(struct vfs_handle_struct *handle,
config->dfreequota = lp_parm_bool(SNUM(handle->conn), "gpfs",
"dfreequota", false);
config->prealloc = lp_parm_bool(SNUM(handle->conn), "gpfs",
"prealloc", true);
config->acl = lp_parm_bool(SNUM(handle->conn), "gpfs", "acl", true);
config->settimes = lp_parm_bool(SNUM(handle->conn), "gpfs",