diff options
| author | Xiubo Li <xiubli@redhat.com> | 2022-06-24 16:43:49 +0800 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2022-08-03 00:54:13 +0200 |
| commit | 0c04a117d77b258febb1a69da7c0cb651d4a38cc (patch) | |
| tree | b1319c8f4d3361ff7313207a41b43165cac0802a /fs/ceph | |
| parent | e027ddb6d3cce80945ab86358929460f91f5cf4f (diff) | |
| download | lwn-0c04a117d77b258febb1a69da7c0cb651d4a38cc.tar.gz lwn-0c04a117d77b258febb1a69da7c0cb651d4a38cc.zip | |
ceph: make f_bsize always equal to f_frsize
The f_frsize maybe changed in the quota size is less than the defualt
4MB.
Signed-off-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/super.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/fs/ceph/super.c b/fs/ceph/super.c index 5539f6c87a45..3fc48b43cab0 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c @@ -72,15 +72,9 @@ static int ceph_statfs(struct dentry *dentry, struct kstatfs *buf) buf->f_type = CEPH_SUPER_MAGIC; /* ?? */ /* - * express utilization in terms of large blocks to avoid + * Express utilization in terms of large blocks to avoid * overflow on 32-bit machines. - * - * NOTE: for the time being, we make bsize == frsize to humor - * not-yet-ancient versions of glibc that are broken. - * Someday, we will probably want to report a real block - * size... whatever that may mean for a network file system! */ - buf->f_bsize = 1 << CEPH_BLOCK_SHIFT; buf->f_frsize = 1 << CEPH_BLOCK_SHIFT; /* @@ -95,6 +89,14 @@ static int ceph_statfs(struct dentry *dentry, struct kstatfs *buf) buf->f_bavail = le64_to_cpu(st.kb_avail) >> (CEPH_BLOCK_SHIFT-10); } + /* + * NOTE: for the time being, we make bsize == frsize to humor + * not-yet-ancient versions of glibc that are broken. + * Someday, we will probably want to report a real block + * size... whatever that may mean for a network file system! + */ + buf->f_bsize = buf->f_frsize; + buf->f_files = le64_to_cpu(st.num_objects); buf->f_ffree = -1; buf->f_namelen = NAME_MAX; |