[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2474-gd9b7228

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  d9b72282c63b57c8e54131306b2a3028a1ea41dc (commit)
      from  737bb950d50ac6c5d4f99279bf535ae3a9963b2f (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit d9b72282c63b57c8e54131306b2a3028a1ea41dc
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Feb 20 22:10:54 2008 -0800

    From: David Disseldorp <ddiss at sgi.com>
    The vfs_prealloc module makes use of the now redundant fd parameter for
    SMB_VFS_FTRUNCATE(), instead get the fd from the files_struct.
    
    Patch for Samba 3.2 Test branch below.
    
    Cheers, David D

-----------------------------------------------------------------------

Summary of changes:
 source/modules/vfs_prealloc.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/modules/vfs_prealloc.c b/source/modules/vfs_prealloc.c
index cb3508d..2a06e3d 100644
--- a/source/modules/vfs_prealloc.c
+++ b/source/modules/vfs_prealloc.c
@@ -199,7 +199,7 @@ 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(fd, *psize);
+		preallocate_space(fsp->fh->fd, *psize);
 	}
 
 	return ret;
@@ -218,4 +218,3 @@ NTSTATUS vfs_prealloc_init(void)
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
 		MODULE, prealloc_op_tuples);
 }
-


-- 
Samba Shared Repository