From 122dbbf00acc1768f98e5b57e94aab2b61671f40 Mon Sep 17 00:00:00 2001 From: Tim Prouty Date: Sat, 31 Jan 2009 20:51:04 -0800 Subject: s3 vfs: Add a destructor to the fsp extension data API I'm not certain if the dummy pointer is needed in struct vfs_fsp_data, but I added it to be consistent with the comment below. --- source3/modules/vfs_cacheprime.c | 2 +- source3/modules/vfs_commit.c | 2 +- source3/modules/vfs_prealloc.c | 2 +- source3/modules/vfs_streams_xattr.c | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'source3/modules') diff --git a/source3/modules/vfs_cacheprime.c b/source3/modules/vfs_cacheprime.c index fed051ca8d..71b850505a 100644 --- a/source3/modules/vfs_cacheprime.c +++ b/source3/modules/vfs_cacheprime.c @@ -54,7 +54,7 @@ static bool prime_cache( SMB_OFF_T * last; ssize_t nread; - last = (SMB_OFF_T *)VFS_ADD_FSP_EXTENSION(handle, fsp, SMB_OFF_T); + last = (SMB_OFF_T *)VFS_ADD_FSP_EXTENSION(handle, fsp, SMB_OFF_T, NULL); if (!last) { return False; } diff --git a/source3/modules/vfs_commit.c b/source3/modules/vfs_commit.c index 1cef6d0243..a8105e021e 100644 --- a/source3/modules/vfs_commit.c +++ b/source3/modules/vfs_commit.c @@ -190,7 +190,7 @@ static int commit_open( MODULE, "eof mode", "none"); if (dthresh > 0 || !strequal(eof_mode, "none")) { - c = VFS_ADD_FSP_EXTENSION(handle, fsp, struct commit_info); + c = VFS_ADD_FSP_EXTENSION(handle, fsp, struct commit_info, NULL); /* Process main tunables */ if (c) { c->dthresh = dthresh; diff --git a/source3/modules/vfs_prealloc.c b/source3/modules/vfs_prealloc.c index 5a339dbf8d..299f6548a1 100644 --- a/source3/modules/vfs_prealloc.c +++ b/source3/modules/vfs_prealloc.c @@ -164,7 +164,7 @@ static int prealloc_open(vfs_handle_struct* handle, if ((flags & O_CREAT) || (flags & O_TRUNC)) { SMB_OFF_T * psize; - psize = VFS_ADD_FSP_EXTENSION(handle, fsp, SMB_OFF_T); + psize = VFS_ADD_FSP_EXTENSION(handle, fsp, SMB_OFF_T, NULL); if (psize == NULL || *psize == -1) { return fd; } diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c index 37473439dd..77ffff5fb5 100644 --- a/source3/modules/vfs_streams_xattr.c +++ b/source3/modules/vfs_streams_xattr.c @@ -405,7 +405,8 @@ static int streams_xattr_open(vfs_handle_struct *handle, const char *fname, } sio = (struct stream_io *)VFS_ADD_FSP_EXTENSION(handle, fsp, - struct stream_io); + struct stream_io, + NULL); if (sio == NULL) { errno = ENOMEM; goto fail; -- cgit