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 1c2434b8793b0ca488370193d7897de94cc8afb1
Author: Dmitry Monakhov <dmonak...@openvz.org>
Date: Tue May 5 13:44:44 2015 +0400
vziolimit: compilation fix
Patch is based on the commit 2bfd4efb04c695aa2c9e60c474d1c93decea9558
From: Andrew Perepechko <pa...@cloudlinux.com>
https://jira.sw.ru/browse/PSBM-20104
Signed-off-by: Dmitry Monakhov <dmonak...@openvz.org>
---
kernel/bc/beancounter.c | 1 +
kernel/ve/vziolimit.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/kernel/bc/beancounter.c b/kernel/bc/beancounter.c
index b4da36b..c9b17de 100644
--- a/kernel/bc/beancounter.c
+++ b/kernel/bc/beancounter.c
@@ -428,6 +428,7 @@ struct user_beancounter *get_beancounter_byuid(uid_t uid,
int create)
snprintf(name, sizeof(name), "%u", uid);
return get_beancounter_by_name(name, create);
}
+EXPORT_SYMBOL(get_beancounter_byuid);
uid_t ub_legacy_id(struct user_beancounter *ub)
{
diff --git a/kernel/ve/vziolimit.c b/kernel/ve/vziolimit.c
index 2cfc58f..4a0fee7 100644
--- a/kernel/ve/vziolimit.c
+++ b/kernel/ve/vziolimit.c
@@ -185,14 +185,14 @@ static int iolimit_virtinfo(struct vnotifier_block *nb,
* to avoid choking future sync operations.
*/
if (iolimit->iops.state > 1 ||
- !(current->flags & PF_FLUSHER))
+ !(current->flags & PF_SWAPWRITE))
iolimit->iops.state--;
}
spin_unlock_irqrestore(&ub->ub_lock, flags);
break;
case VIRTINFO_IO_PREPARE:
case VIRTINFO_IO_JOURNAL:
- if (current->flags & PF_FLUSHER)
+ if (current->flags & PF_SWAPWRITE)
break;
timeout = iolimit_timeout(iolimit);
if (timeout && !fatal_signal_pending(current))
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
