[RHEL7,COMMIT] fuse kio: cleanup in token enqueue

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

Details

Message ID 201806042005.w54K5owp005049@finist_ce7.work
State New
Series "fuse kio: cleanup in token enqueue"
Headers show

Commit Message

Konstantin Khorenko June 4, 2018, 8:05 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.4
------>
commit 0bf934240c56649bb58d0df43b0e875bd27862f9
Author: Alexey Kuznetsov <kuznet@virtuozzo.com>
Date:   Mon Jun 4 23:05:50 2018 +0300

    fuse kio: cleanup in token enqueue
    
    In case of skipping token mark this CS as passed congestion check.
    Otherwise at the next round we will try wait again. It is not a real bug,
    but still some inconsistency.
    
    Signed-off-by: Alexey Kuznetsov <kuznet@virtuozzo.com>
    
    Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 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 90e311f7e995..e649a9b5efb5 100644
--- a/fs/fuse/kio/pcs/pcs_map.c
+++ b/fs/fuse/kio/pcs/pcs_map.c
@@ -1966,6 +1966,7 @@  static int ireq_queue_tokens(struct pcs_int_request * ireq, struct pcs_cs_list *
 			       toks[i] = NULL;
 			       queued = 1;
 		       } else {
+			       ireq->tok_reserved |= (1ULL << i);
 			       list_add(&toks[i]->token.tok_link, &drop);
 		       }
 	       }