sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r21646: Patch from SATOH Fumiyasu <fumiyas@osstech.co.jp>

Browse Source 
- add minsize parameter. Bug #4409.
Jeremy.
(This used to be commit b9408304db)
This commit is contained in:
Jeremy Allison 2007-03-01 23:57:37 +00:00 committed by Gerald (Jerry) Carter
parent 059e4cfa03
commit cba9ad6633
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source3/modules/vfs_recycle.c
View File

@ -153,17 +153,28 @@ static const char **recycle_noversions(vfs_handle_struct *handle)
return tmp_lp;
}
static int recycle_maxsize(vfs_handle_struct *handle)
static SMB_OFF_T recycle_maxsize(vfs_handle_struct *handle)
{
int maxsize;
SMB_OFF_T maxsize;
maxsize = lp_parm_int(SNUM(handle->conn), "recycle", "maxsize", -1);
maxsize = lp_parm_ulong(SNUM(handle->conn), "recycle", "maxsize", 0);
DEBUG(10, ("recycle: maxsize = %d\n", maxsize));
DEBUG(10, ("recycle: maxsize = %lu\n", maxsize));
return maxsize;
}
static SMB_OFF_T recycle_minsize(vfs_handle_struct *handle)
{
SMB_OFF_T minsize;
minsize = lp_parm_ulong(SNUM(handle->conn), "recycle", "minsize", 0);
DEBUG(10, ("recycle: minsize = %lu\n", minsize));
return minsize;
}
static mode_t recycle_directory_mode(vfs_handle_struct *handle)
{
int dirmode;
@ -381,7 +392,7 @@ static int recycle_unlink(vfs_handle_struct *handle, const char *file_name)
const char *base;
char *repository = NULL;
int i = 1;
int maxsize;
SMB_OFF_T maxsize, minsize;
SMB_OFF_T file_size; /* space_avail; */
BOOL exist;
int rc = -1;
@ -431,6 +442,12 @@ static int recycle_unlink(vfs_handle_struct *handle, const char *file_name)
rc = SMB_VFS_NEXT_UNLINK(handle, file_name);
goto done;
}
minsize = recycle_minsize(handle);
if(minsize > 0 && file_size < minsize) {
DEBUG(3, ("recycle: File %s lowers minimum recycle size, purging... \n", file_name));
rc = SMB_VFS_NEXT_UNLINK(handle, file_name);
goto done;
}
/* FIXME: this is wrong: moving files with rename does not change the disk space
* allocation