[RHEL7,COMMIT] fs/fuse kio_pcs: forgotten setting of the next phase

Submitted by Konstantin Khorenko on Oct. 31, 2018, 1:02 p.m.

Details

Message ID 201810311302.w9VD2mpt023203@finist-ce7.sw.ru
State New
Series "fs/fuse kio_pcs: forgotten setting of the next phase"
Headers show

Commit Message

Konstantin Khorenko Oct. 31, 2018, 1:02 p.m.
The commit is pushed to "branch-rh7-3.10.0-862.14.4.vz7.72.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-862.14.4.vz7.72.15
------>
commit 173869b1af63630741274e76ee2c446142780b6a
Author: Pavel Butsykin <pbutsykin@virtuozzo.com>
Date:   Wed Oct 31 16:02:48 2018 +0300

    fs/fuse kio_pcs: forgotten setting of the next phase
    
    It was also lost when valid_for_truncate() ported to kernel.
    
    Signed-off-by: Pavel Butsykin <pbutsykin@virtuozzo.com>
    Reviewed-by: Kirill Tkhai <ktkhai@virtuozzo.com>
    
    =====================
    Patchset description:
    
    FUSE KIO: Mapping truncate fixes
    
    https://jira.sw.ru/browse/PSBM-89539
---
 fs/fuse/kio/pcs/pcs_map.c | 1 +
 1 file changed, 1 insertion(+)

Patch hide | download patch | download mbox

diff --git a/fs/fuse/kio/pcs/pcs_map.c b/fs/fuse/kio/pcs/pcs_map.c
index 2990e8e2a3e9..97b85a2c1b79 100644
--- a/fs/fuse/kio/pcs/pcs_map.c
+++ b/fs/fuse/kio/pcs/pcs_map.c
@@ -2367,6 +2367,7 @@  static int valid_for_truncate(struct pcs_map_entry * m, struct pcs_int_request *
 	 */
 	if (!(m->state & (PCS_MAP_ERROR|PCS_MAP_RESOLVING|PCS_MAP_NEW))) {
 		map_remote_error_nolock(m, PCS_ERR_CSD_STALE_MAP, m->cs_list ? m->cs_list->cs[0].info.id.val : 0);
+		ireq->truncreq.phase = 1;
 		ireq->truncreq.version = m->version;
 	}
 	/* Otherwise lookup valid map first. */