summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2009-12-03 02:32:47 +0100
committerBjörn Jacke <bj@sernet.de>2009-12-03 02:36:19 +0100
commit7c938d16a9cf4daa1d4a61399f326f2683d08af4 (patch)
treea0e2881d8ce8e712f3c8366df4b936ef1dda2c2c
parent48358b3eaa425d8fbfec7bfd8ccf56860b5a1ba0 (diff)
downloadsamba-7c938d16a9cf4daa1d4a61399f326f2683d08af4.tar.gz
samba-7c938d16a9cf4daa1d4a61399f326f2683d08af4.tar.bz2
samba-7c938d16a9cf4daa1d4a61399f326f2683d08af4.zip
ѕ3: remove superfluous option check
this function is only called when strict alloc is set, no reason to check that twice.
-rw-r--r--source3/modules/vfs_default.c23
1 files changed, 10 insertions, 13 deletions
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index da775d160b..3691fb0e7e 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. */