Skip to content

Commit 210b41b

Browse files
spuiukgregkh
authored andcommitted
cifs: Fix df output for users with quota limits
commit 42bec214d8bd432be6d32a1acb0a9079ecd4d142 upstream. The df for a SMB2 share triggers a GetInfo call for FS_FULL_SIZE_INFORMATION. The values returned are used to populate struct statfs. The problem is that none of the information returned by the call contains the total blocks available on the filesystem. Instead we use the blocks available to the user ie. quota limitation when filling out statfs.f_blocks. The information returned does contain Actual free units on the filesystem and is used to populate statfs.f_bfree. For users with quota enabled, it can lead to situations where the total free space reported is more than the total blocks on the system ending up with df reports like the following # df -h /mnt/a Filesystem Size Used Avail Use% Mounted on //192.168.22.10/a 2.5G -2.3G 2.5G - /mnt/a To fix this problem, we instead populate both statfs.f_bfree with the same value as statfs.f_bavail ie. CallerAvailableAllocationUnits. This is similar to what is done already in the code for cifs and df now reports the quota information for the user used to mount the share. # df --si /mnt/a Filesystem Size Used Avail Use% Mounted on //192.168.22.10/a 2.7G 101M 2.6G 4% /mnt/a Signed-off-by: Sachin Prabhu <sprabhu@redhat.com> Signed-off-by: Pierguido Lambri <plambri@redhat.com> Signed-off-by: Steve French <smfrench@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 9f57741 commit 210b41b

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

fs/cifs/smb2pdu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2768,8 +2768,8 @@ copy_fs_info_to_kstatfs(struct smb2_fs_full_size_info *pfs_inf,
27682768
kst->f_bsize = le32_to_cpu(pfs_inf->BytesPerSector) *
27692769
le32_to_cpu(pfs_inf->SectorsPerAllocationUnit);
27702770
kst->f_blocks = le64_to_cpu(pfs_inf->TotalAllocationUnits);
2771-
kst->f_bfree = le64_to_cpu(pfs_inf->ActualAvailableAllocationUnits);
2772-
kst->f_bavail = le64_to_cpu(pfs_inf->CallerAvailableAllocationUnits);
2771+
kst->f_bfree = kst->f_bavail =
2772+
le64_to_cpu(pfs_inf->CallerAvailableAllocationUnits);
27732773
return;
27742774
}
27752775

0 commit comments

Comments
 (0)