[RHEL7,COMMIT] fs/fuse kio_pcs: some cleanup ireq_on_error_()

Submitted by Konstantin Khorenko on June 8, 2018, 4:03 p.m.

Details

Message ID 201806081603.w58G3IuG019589@finist_ce7.work
State New
Series "fs/fuse kio_pcs: some cleanup ireq_on_error_()"
Headers show

Commit Message

Konstantin Khorenko June 8, 2018, 4:03 p.m.
The commit is pushed to "branch-rh7-3.10.0-693.21.1.vz7.50.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-693.21.1.vz7.50.7
------>
commit 8c3180dc70bdccece3d13208c3644577061c2461
Author: Pavel Butsykin <pbutsykin@virtuozzo.com>
Date:   Fri Jun 8 19:03:11 2018 +0300

    fs/fuse kio_pcs: some cleanup ireq_on_error_()
    
    Signed-off-by: Pavel Butsykin <pbutsykin@virtuozzo.com>
    Reviewed-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 fs/fuse/kio/pcs/pcs_cluster.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

Patch hide | download patch | download mbox

diff --git a/fs/fuse/kio/pcs/pcs_cluster.c b/fs/fuse/kio/pcs/pcs_cluster.c
index 84d109df9002..de272276fda4 100644
--- a/fs/fuse/kio/pcs/pcs_cluster.c
+++ b/fs/fuse/kio/pcs/pcs_cluster.c
@@ -486,11 +486,8 @@  static void ireq_on_error_(struct pcs_int_request *ireq)
 	case PCS_ERR_LEASE_EXPIRED:
 	case PCS_ERR_INTEGRITY_FAIL: {
 		/* TODO:  tag ireq->dentry with EIO here */
-		goto fatal;
 	}
 	case PCS_ERR_CSD_LACKING:
-		goto fatal;
-		break;
 	case PCS_ERR_INV_PARAMS:
 	case PCS_ERR_NOT_FOUND:
 	case PCS_ERR_NON_EMPTY_DIR:
@@ -498,9 +495,9 @@  static void ireq_on_error_(struct pcs_int_request *ireq)
 	case PCS_ERR_IS_DIR:
 	case PCS_ERR_NO_STORAGE:
 	case PCS_ERR_UNAVAIL:
-fatal:
-		printk(KERN_INFO "%s fatal error:%d nodeid:%llu", __func__,
-		       ireq->error.value, ireq->dentry->inode->nodeid);
+		pr_info("%s fatal error:%d ireq->type:%d nodeid:%llu",
+			__func__, ireq->error.value, ireq->type,
+			ireq->dentry->inode->nodeid);
 		ireq->flags |= IREQ_F_FATAL;
 		break;
 	case PCS_ERR_LEASE_CONFLICT:
@@ -508,7 +505,6 @@  static void ireq_on_error_(struct pcs_int_request *ireq)
 		break;
 	default:
 		break;
-		;
 	}
 }