[Devel] [PATCH RHEL7 COMMIT] vziolimit: port diff-iolimit-dont-throttle-flushers

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-123.1.2.vz7.4.9
------>
commit 75c3c4c7c1ea7734d550f752d4865dbd9e5074b4
Author: Dmitry Monakhov <dmonakhov at openvz.org>
Date:   Tue May 5 13:44:36 2015 +0400

    vziolimit: port diff-iolimit-dont-throttle-flushers
    
    iolimit: do not throttle flush threads
    
    Account pdflush IO progress but not delay it.
    
    Signed-off-by: Konstantin Khlebnikov <khlebnikov at openvz.org>
    
    ====================================
    https://jira.sw.ru/browse/PSBM-20104
    
    Signed-off-by: Dmitry Monakhov <dmonakhov at openvz.org>
---
 kernel/ve/vziolimit.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/ve/vziolimit.c b/kernel/ve/vziolimit.c
index ac5abcd..72b8d51 100644
--- a/kernel/ve/vziolimit.c
+++ b/kernel/ve/vziolimit.c
@@ -110,6 +110,8 @@ static int iolimit_virtinfo(struct vnotifier_block *nb,
 			break;
 		case VIRTINFO_IO_PREPARE:
 		case VIRTINFO_IO_JOURNAL:
+			if (current->flags & PF_FLUSHER)
+				break;
 			timeout = throttle_timeout(&iolimit->throttle, jiffies);
 			if (timeout) {
 				__set_current_state(TASK_UNINTERRUPTIBLE);