From 7c938d16a9cf4daa1d4a61399f326f2683d08af4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= Date: Thu, 3 Dec 2009 02:32:47 +0100 Subject: =?UTF-8?q?=D1=953:=20remove=20superfluous=20option=20check?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this function is only called when strict alloc is set, no reason to check that twice. --- source3/modules/vfs_default.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'source3/modules/vfs_default.c') diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index da775d160ba..3691fb0e7e7 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -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. */ -- cgit v1.2.1