[RHEL7,COMMIT] Revert "fs/fuse kio: add warning about jumbo chunks"

Submitted by Konstantin Khorenko on Dec. 10, 2019, 1:19 p.m.

Details

Message ID 201912101319.xBADJQWG000792@finist-ce7.sw.ru
State New
Series "fs/fuse kio: add warning about jumbo chunks"
Headers show

Commit Message

Konstantin Khorenko Dec. 10, 2019, 1:19 p.m.
The commit is pushed to "branch-rh7-3.10.0-1062.7.1.vz7.130.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1062.7.1.vz7.130.3
------>
commit 8388cd61ffcd737a9a995b058a5a4885ae94b361
Author: Konstantin Khorenko <khorenko@virtuozzo.com>
Date:   Tue Dec 10 16:12:57 2019 +0300

    Revert "fs/fuse kio: add warning about jumbo chunks"
    
    This reverts commit 9896eef1f10b59018ef93f6c1cc41ce79ff2a1e1.
    
    After b9d027982dae ("fs/fuse kio: sync pcs_mds_sys_info struct")
    the patch being reverted is just incorrect because
    pcs_mds_sys_info.map_type has u8 type now and the patch being reverted
    checks 28th bit in info.sys.map_type.
    
    The proper check for jumbo chunks is implemented by another commit with
    the same subject: 6bd1a4548c09 ("fs/fuse kio: add warning about jumbo
    chunks")
    
    Found-by: Vasily Averin <vvs@virtuozzo.com>
    Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com>
---
 fs/fuse/kio/pcs/pcs_fuse_kdirect.c | 3 ---
 fs/fuse/kio/pcs/pcs_mds_prot.h     | 2 --
 2 files changed, 5 deletions(-)

Patch hide | download patch | download mbox

diff --git a/fs/fuse/kio/pcs/pcs_fuse_kdirect.c b/fs/fuse/kio/pcs/pcs_fuse_kdirect.c
index 98dd0cf3ddd9..52b35c878c06 100644
--- a/fs/fuse/kio/pcs/pcs_fuse_kdirect.c
+++ b/fs/fuse/kio/pcs/pcs_fuse_kdirect.c
@@ -326,9 +326,6 @@  static int kpcs_do_file_open(struct fuse_conn *fc, struct file *file, struct ino
 
 	if (info.sys.map_type != PCS_MAP_PLAIN) {
 		TRACE("Unsupported map_type:%x, ignore\n", info.sys.map_type);
-
-		if (info.sys.map_type & PCS_JUMBO_CHUNK_FLAG)
-			pr_warn_once("kio: fpath doesn't support jumbo chunks\n");
 		return 0;
 	}
 
diff --git a/fs/fuse/kio/pcs/pcs_mds_prot.h b/fs/fuse/kio/pcs/pcs_mds_prot.h
index 1dc1724fa94d..80c20fde1537 100644
--- a/fs/fuse/kio/pcs/pcs_mds_prot.h
+++ b/fs/fuse/kio/pcs/pcs_mds_prot.h
@@ -259,8 +259,6 @@  enum
 	PCS_MAP_LS = PCS_MAP_COMBINED, /* Log structured storage */
 };
 
-#define PCS_JUMBO_CHUNK_FLAG (1 << 28) /* Chunks size > 4G */
-
 /* Max inline file size */
 #define PCS_MAX_INLINE_SIZE 0x100000 /* 1Mb */