From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 9 Dec 2020 19:20:08 +0000 (-0800)
Subject: Merge PR #36127 into master
X-Git-Tag: v17.0.0~362
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c51da49e415e6e34d061254545a75279456b3de8;p=ceph-ci.git

Merge PR #36127 into master

* refs/pull/36127/head:
	client: more reasonable statfs ffree

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
---

c51da49e415e6e34d061254545a75279456b3de8
diff --cc src/client/Client.cc
index fb0dc149378,2d8a20f9271..bc259bb48d4
mode 100644,100755..100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc