On Mon, Nov 18, 2019 at 01:09:49PM +0800, Chengguang Xu wrote: > Currently we replace filesystem statistics using prjquota info > on statfs when specified directory has project id inherit flag. > However, statfs on a file(accurately non-dir) which is under the > project quota dir(with inherit flag) still shows whole filesystem > statistics. In container use case, it will give container user > inconsistent experience and cause confusion about available free > space. > > Detail info like below: > We use project quota to limit disk space usage for a container > and run df command inside container. > > Run df on a directory: > > [root /]# df -h /etc/ > Filesystem Size Used Avail Use% Mounted on > kataShared 1.0G 13M 1012M 2% / > > Run df on a file: > > [root /]# df -h /etc/exports > Filesystem Size Used Avail Use% Mounted on > kataShared 1.5T 778M 1.5T 1% / > > Signed-off-by: Chengguang Xu <cgxu519@xxxxxxxxxxxx> > --- > fs/xfs/xfs_super.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c > index 8d1df9f8be07..9f4d9e86572a 100644 > --- a/fs/xfs/xfs_super.c > +++ b/fs/xfs/xfs_super.c > @@ -1125,7 +1125,8 @@ xfs_fs_statfs( > statp->f_ffree = max_t(int64_t, ffree, 0); > > > - if ((ip->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) && > + if (((ip->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) || > + !S_ISDIR(dentry->d_inode->i_mode)) && > ((mp->m_qflags & (XFS_PQUOTA_ACCT|XFS_PQUOTA_ENFD))) == > (XFS_PQUOTA_ACCT|XFS_PQUOTA_ENFD)) > xfs_qm_statvfs(ip, statp); So this also changes statfs() for non-directory quota uses. It will now *always* report project quota info for a file, whether directory quotas are in use or not. This is going to confuse users who see the full filesystem info when they statfs a directory, then see project quota limits when they statfs a file. i.e. all this patch does is move the inconsistency in reporting to non-directory based project quota users. So from that perspective, this is not a viable solution. What is a viable solution is to add an explicit dirquota mount option (which we've recently discussed) that explicitly presents all directory quota specific behaviours to userspace without tying them to the internal project quota-based on-disk implementation. This is the only sane way to solve this problem as it tells the filesysetm exactly what behaviour set it should be exposing to userspace. IOWs, the statfs code should probably end up looking like this: - if ((ip->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) && + if ((mp->m_flags & XFS_MOUNT_DIRQUOTA) && ((mp->m_qflags & (XFS_PQUOTA_ACCT|XFS_PQUOTA_ENFD))) == (XFS_PQUOTA_ACCT|XFS_PQUOTA_ENFD)) xfs_qm_statvfs(ip, statp); Cheers, Dave. -- Dave Chinner david@xxxxxxxxxxxxx
