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>

diff --git a/source3/smbd/ntquotas.c b/source3/smbd/ntquotas.c
index 5622f1023a822073729219c6948cc885a2f733c5..47633b682a871cab8f99ff69407bc380baf6c809 100644 (file)
--- 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;
 }
 
        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)
 {
 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.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",
        if (psid && !sid_to_uid(psid, &id.uid)) {
                struct dom_sid_buf buf;
                DEBUG(0,("sid_to_uid: failed, SID[%s]\n",