From: Björn Jacke <bj@sernet.de>
Date: Thu, 7 Feb 2019 03:23:13 +0000 (+0100)
Subject: sysquotas_xfs: fix inode limit setting, which is not depeding on blocksize
X-Git-Tag: ldb-1.6.1~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28da07231936dc8565a2ce2040ebad7b5e8da2e7;p=thirdparty%2Fsamba.git

sysquotas_xfs: fix inode limit setting, which is not depeding on blocksize

Signed-off-by: Bjoern Jacke <bjacke@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>
---

diff --git a/source3/lib/sysquotas_xfs.c b/source3/lib/sysquotas_xfs.c
index 8db52bd8459..6b184874435 100644
--- a/source3/lib/sysquotas_xfs.c
+++ b/source3/lib/sysquotas_xfs.c
@@ -188,14 +188,12 @@ int sys_set_xfs_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qt
 	if (bsize == dp->bsize) {
 		D.d_blk_softlimit = dp->softlimit;
 		D.d_blk_hardlimit = dp->hardlimit;
-		D.d_ino_hardlimit = dp->ihardlimit;
-		D.d_ino_softlimit = dp->isoftlimit;
 	} else {
 		D.d_blk_softlimit = (dp->softlimit*dp->bsize)/bsize;
 		D.d_blk_hardlimit = (dp->hardlimit*dp->bsize)/bsize;
-		D.d_ino_hardlimit = (dp->ihardlimit*dp->bsize)/bsize;
-		D.d_ino_softlimit = (dp->isoftlimit*dp->bsize)/bsize;		
 	}
+	D.d_ino_hardlimit = dp->ihardlimit;
+	D.d_ino_softlimit = dp->isoftlimit;
 
 	qflags = dp->qflags;