sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-20 22:50:26 +03:00
Code

ѕ3: remove superfluous option check

Browse Source 
this function is only called when strict alloc is set, no reason to check that twice.
This commit is contained in:
Björn Jacke 2009-12-03 02:32:47 +01:00
parent 48358b3eaa
commit 7c938d16a9
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source3/modules/vfs_default.c
View File

@ -915,6 +915,8 @@ static int strict_allocate_ftruncate(vfs_handle_struct *handle, files_struct *fs
SMB_OFF_T currpos = SMB_VFS_LSEEK(fsp, 0, SEEK_CUR);
unsigned char zero_space[4096];
SMB_OFF_T space_to_write;
uint64_t space_avail;
uint64_t bsize,dfree,dsize;
if (currpos == -1)
return -1;
@ -956,19 +958,14 @@ static int strict_allocate_ftruncate(vfs_handle_struct *handle, files_struct *fs
#endif
/* available disk space is enough or not? */
space_to_write = len - st.st_ex_size;
if (lp_strict_allocate(SNUM(fsp->conn))){
uint64_t space_avail;
uint64_t bsize,dfree,dsize;
space_avail = get_dfree_info(fsp->conn,
fsp->fsp_name->base_name, false,
&bsize, &dfree, &dsize);
/* space_avail is 1k blocks */
if (space_avail == (uint64_t)-1 ||
((uint64_t)space_to_write/1024 > space_avail) ) {
errno = ENOSPC;
return -1;
}
space_avail = get_dfree_info(fsp->conn,
fsp->fsp_name->base_name, false,
&bsize,&dfree,&dsize);
/* space_avail is 1k blocks */
if (space_avail == (uint64_t)-1 ||
((uint64_t)space_to_write/1024 > space_avail) ) {
errno = ENOSPC;
return -1;
}
/* Write out the real space on disk. */