[RHEL7,COMMIT] Revert "fuse kio: never ignore fuse_req error during PCS_IOC_GETMAP"

Submitted by Konstantin Khorenko on Nov. 27, 2018, 9:13 a.m.

Details

Message ID 201811270913.wAR9D5Tg023440@finist-ce7.sw.ru
State New
Series "fuse kio: never ignore fuse_req error during PCS_IOC_GETMAP"
Headers show

Commit Message

Konstantin Khorenko Nov. 27, 2018, 9:13 a.m.
The commit is pushed to "branch-rh7-3.10.0-862.20.2.vz7.73.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-862.20.2.vz7.73.12
------>
commit be36c79a43049dc607c6df34d6651db09574e42b
Author: Konstantin Khorenko <khorenko@virtuozzo.com>
Date:   Tue Nov 27 12:08:58 2018 +0300

    Revert "fuse kio: never ignore fuse_req error during PCS_IOC_GETMAP"
    
    This patch increases fastpath version number, so it requires
    appropriate userspace version inc, while userspace part is
    still not ready.
    
    So, roll back the patch until the userspace part is ready.
    
    This reverts commit ce803d074c40ac88744845a511ff41252992968e.
    
    Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com>
---
 fs/fuse/kio/pcs/pcs_fuse_kdirect.c | 6 ++----
 fs/fuse/kio/pcs/pcs_ioctl.h        | 2 +-
 2 files changed, 3 insertions(+), 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 3b1d819792b2..d1d3f7f4a256 100644
--- a/fs/fuse/kio/pcs/pcs_fuse_kdirect.c
+++ b/fs/fuse/kio/pcs/pcs_fuse_kdirect.c
@@ -425,10 +425,8 @@  static void fuse_complete_map_work(struct work_struct *w)
 
 	BUG_ON(!m);
 	BUG_ON(!omap);
-
-	if (pcs_if_error(&work->status)) {
-		pcs_copy_error(&omap->error, &work->status);
-	} else if (omap->cs_cnt > MAX_CS_CNT) {
+	pcs_copy_error_cond(&omap->error, &work->status);
+	if (omap->cs_cnt > MAX_CS_CNT) {
 		printk("Corrupted cs_cnt from userspace");
 		pcs_set_local_error(&omap->error, PCS_ERR_PROTOCOL);
 	}
diff --git a/fs/fuse/kio/pcs/pcs_ioctl.h b/fs/fuse/kio/pcs/pcs_ioctl.h
index 5cf40e35f881..b36bc653b210 100644
--- a/fs/fuse/kio/pcs/pcs_ioctl.h
+++ b/fs/fuse/kio/pcs/pcs_ioctl.h
@@ -10,7 +10,7 @@ 
 #include "pcs_map.h"
 #include "pcs_rpc.h"
 
-#define PCS_FAST_PATH_VERSION ((PCS_FAST_PATH_VERSION_T){1, 2})
+#define PCS_FAST_PATH_VERSION ((PCS_FAST_PATH_VERSION_T){1, 1})
 
 #define PCS_FUSE_INO_SPECIAL_ ((unsigned long long)-0x1000)