|
 |
a3470f |
From 4353f2061b81a7d3f9538d7d080890e394cbe67c Mon Sep 17 00:00:00 2001
|
|
|
a3470f |
From: Csaba Henk <csaba@redhat.com>
|
|
|
a3470f |
Date: Sat, 14 Apr 2018 08:22:48 +0200
|
|
|
a3470f |
Subject: [PATCH 231/236] fuse: retire statvfs tweak
|
|
|
a3470f |
|
|
|
a3470f |
fuse xlator used to override the filesystem
|
|
|
a3470f |
block size of the storage backend to indicate
|
|
|
a3470f |
its preferences. Now we retire this tweak and
|
|
|
a3470f |
pass on what we get from the backend.
|
|
|
a3470f |
|
|
|
a3470f |
This fixes the anomaly reported in the referred
|
|
|
a3470f |
BUG. For more background, see the following email,
|
|
|
a3470f |
which was sent out to gluster-devel and gluster-users
|
|
|
a3470f |
mailing lists to gauge if anyone sees any use of
|
|
|
a3470f |
this tweak:
|
|
|
a3470f |
|
|
|
a3470f |
http://lists.gluster.org/pipermail/gluster-devel/2018-March/054660.html
|
|
|
a3470f |
http://lists.gluster.org/pipermail/gluster-users/2018-March/033775.html
|
|
|
a3470f |
|
|
|
a3470f |
Noone vetoed the removal of it but it got endorsement:
|
|
|
a3470f |
|
|
|
a3470f |
http://lists.gluster.org/pipermail/gluster-devel/2018-March/054686.html
|
|
|
a3470f |
|
|
|
a3470f |
upstream: https://review.gluster.org/19873
|
|
|
a3470f |
> BUG: 1523219
|
|
|
a3470f |
> Change-Id: I3b7111d3037a1b91a288c1589f407b2c48d81bfa
|
|
|
a3470f |
> Signed-off-by: Csaba Henk <csaba@redhat.com>
|
|
|
a3470f |
|
|
|
a3470f |
BUG: 1523216
|
|
|
a3470f |
Change-Id: I3b7111d3037a1b91a288c1589f407b2c48d81bfa
|
|
|
a3470f |
Signed-off-by: Csaba Henk <csaba@redhat.com>
|
|
|
a3470f |
Reviewed-on: https://code.engineering.redhat.com/gerrit/136313
|
|
|
a3470f |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
a3470f |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
a3470f |
---
|
|
|
a3470f |
xlators/mount/fuse/src/fuse-bridge.c | 13 -------------
|
|
|
a3470f |
1 file changed, 13 deletions(-)
|
|
|
a3470f |
|
|
|
a3470f |
diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c
|
|
|
a3470f |
index 44697d2..b767ea4 100644
|
|
|
a3470f |
--- a/xlators/mount/fuse/src/fuse-bridge.c
|
|
|
a3470f |
+++ b/xlators/mount/fuse/src/fuse-bridge.c
|
|
|
a3470f |
@@ -3164,19 +3164,6 @@ fuse_statfs_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
|
|
|
a3470f |
gf_fop_list[frame->root->op]);
|
|
|
a3470f |
|
|
|
a3470f |
if (op_ret == 0) {
|
|
|
a3470f |
-#ifndef GF_DARWIN_HOST_OS
|
|
|
a3470f |
- /* MacFUSE doesn't respect anyof these tweaks */
|
|
|
a3470f |
- buf->f_blocks *= buf->f_frsize;
|
|
|
a3470f |
- buf->f_blocks /= this->ctx->page_size;
|
|
|
a3470f |
-
|
|
|
a3470f |
- buf->f_bavail *= buf->f_frsize;
|
|
|
a3470f |
- buf->f_bavail /= this->ctx->page_size;
|
|
|
a3470f |
-
|
|
|
a3470f |
- buf->f_bfree *= buf->f_frsize;
|
|
|
a3470f |
- buf->f_bfree /= this->ctx->page_size;
|
|
|
a3470f |
-
|
|
|
a3470f |
- buf->f_frsize = buf->f_bsize =this->ctx->page_size;
|
|
|
a3470f |
-#endif /* GF_DARWIN_HOST_OS */
|
|
|
a3470f |
fso.st.bsize = buf->f_bsize;
|
|
|
a3470f |
fso.st.frsize = buf->f_frsize;
|
|
|
a3470f |
fso.st.blocks = buf->f_blocks;
|
|
|
a3470f |
--
|
|
|
a3470f |
1.8.3.1
|
|
|
a3470f |
|