summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2019-02-14 12:09:38 +0100
committerBjoern Jacke <bjacke@samba.org>2019-02-17 13:33:12 +0100
commitbc2cc68713bcf4d8752cd33776f0bf9e36a4e8e3 (patch)
tree4ffeb2d341c83d6ebf855d96b9e4a29c20cac8a3 /source3
parent2888bee43cb387f8d1037d017582e84160c3fd08 (diff)
downloadsamba-bc2cc68713bcf4d8752cd33776f0bf9e36a4e8e3.tar.gz
ntquotas: do not set inode limits when setting space quota
we are supposed to set a space quota limit, we should not calculate an additional artifical inode limit out of that. Signed-off-by: Bjoern Jacke <bjacke@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/ntquotas.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/source3/smbd/ntquotas.c b/source3/smbd/ntquotas.c
index 5622f1023a8..47633b682a8 100644
--- a/source3/smbd/ntquotas.c
+++ b/source3/smbd/ntquotas.c
@@ -57,18 +57,6 @@ static uint64_t limit_unix2nt(uint64_t in, uint64_t bsize)
return ret;
}
-static uint64_t limit_blk2inodes(uint64_t in)
-{
- uint64_t ret = (uint64_t)0;
-
- ret = (uint64_t)(in/2);
-
- if (ret == 0 && in != 0)
- ret = (uint64_t)1;
-
- return ret;
-}
-
NTSTATUS vfs_get_ntquota(files_struct *fsp, enum SMB_QUOTA_TYPE qtype,
struct dom_sid *psid, SMB_NTQUOTA_STRUCT *qt)
{
@@ -146,9 +134,6 @@ int vfs_set_ntquota(files_struct *fsp, enum SMB_QUOTA_TYPE qtype, struct dom_sid
D.hardlimit = limit_nt2unix(qt->hardlim,D.bsize);
D.qflags = qt->qflags;
- D.isoftlimit = limit_blk2inodes(D.softlimit);
- D.ihardlimit = limit_blk2inodes(D.hardlimit);
-
if (psid && !sid_to_uid(psid, &id.uid)) {
struct dom_sid_buf buf;
DEBUG(0,("sid_to_uid: failed, SID[%s]\n",