return 0;
}
-static int prealloc_open(vfs_handle_struct* handle,
- struct smb_filename *smb_fname,
- files_struct * fsp,
- int flags,
- mode_t mode)
+static int prealloc_openat(struct vfs_handle_struct* handle,
+ const struct files_struct *dirfsp,
+ const struct smb_filename *smb_fname,
+ files_struct *fsp,
+ const struct vfs_open_how *how)
{
int fd;
off_t size = 0;
-
const char * dot;
char fext[10];
- if (!(flags & (O_CREAT|O_TRUNC))) {
+ if (!(how->flags & (O_CREAT|O_TRUNC))) {
/* Caller is not intending to rewrite the file. Let's not mess
* with the allocation in this case.
*/
dot = strrchr(smb_fname->base_name, '.');
if (dot && *++dot) {
if (strlen(dot) < sizeof(fext)) {
+ bool ok;
strncpy(fext, dot, sizeof(fext));
- if (!strnorm(fext, CASE_LOWER)) {
+ ok = strlower_m(fext);
+ if (!ok);
goto normal_open;
}
}
goto normal_open;
}
- fd = SMB_VFS_NEXT_OPEN(handle, smb_fname, fsp, flags, mode);
+ fd = SMB_VFS_NEXT_OPENAT(handle, dirfsp, smb_fname, fsp, how);
if (fd < 0) {
return fd;
}
- /* Prellocate only if the file is being created or replaced. Note that
+ /* Preallocate only if the file is being created or replaced. Note that
* Samba won't ever pass down O_TRUNC, which is why we have to handle
* truncate calls specially.
*/
- if ((flags & O_CREAT) || (flags & O_TRUNC)) {
+ if ((how->flags & O_CREAT) || (how->flags & O_TRUNC)) {
off_t * psize;
psize = VFS_ADD_FSP_EXTENSION(handle, fsp, off_t, NULL);
*/
DEBUG(module_debug, ("%s: skipping preallocation for %s\n",
MODULE, smb_fname_str_dbg(smb_fname)));
- return SMB_VFS_NEXT_OPEN(handle, smb_fname, fsp, flags, mode);
+ return SMB_VFS_NEXT_OPENAT(handle, dirfsp, smb_fname, fsp, how);
}
static int prealloc_ftruncate(vfs_handle_struct * handle,
/* Maintain the allocated space even in the face of truncates. */
if ((psize = VFS_FETCH_FSP_EXTENSION(handle, fsp))) {
- preallocate_space(fsp->fh->fd, *psize);
+ preallocate_space(fsp_get_io_fd(fsp), *psize);
}
return ret;
}
static struct vfs_fn_pointers prealloc_fns = {
- .open_fn = prealloc_open,
+ .openat_fn = prealloc_openat,
.ftruncate_fn = prealloc_ftruncate,
.connect_fn = prealloc_connect,
};
-NTSTATUS vfs_prealloc_init(TALLOC_CTX *);
+static_decl_vfs;
NTSTATUS vfs_prealloc_init(TALLOC_CTX *ctx)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,