[Devel] [PATCH RHEL7 COMMIT] ub: drop unused UB_DIRTY_EXCEEDED

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-229.7.2.vz7.9.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-229.7.2.vz7.9.24
------>
commit 80af1836de7654ebb8ae7aab30790ff82d5fefdc
Author: Andrey Ryabinin <aryabinin at virtuozzo.com>
Date:   Fri Jan 22 13:35:15 2016 +0400

    ub: drop unused UB_DIRTY_EXCEEDED
    
    Drop unused UB_DIRTY_EXCEEDED and ub_flags field as well,
    since this was the only flag.
    
    Signed-off-by: Andrey Ryabinin <aryabinin at virtuozzo.com>
    Reviewed-by: Vladimir Davydov <vdavydov at virtuozzo.com>
---
 include/bc/beancounter.h | 6 ------
 kernel/ve/vziolimit.c    | 2 --
 2 files changed, 8 deletions(-)

diff --git a/include/bc/beancounter.h b/include/bc/beancounter.h
index 5ba999e..d004afa 100644
--- a/include/bc/beancounter.h
+++ b/include/bc/beancounter.h
@@ -98,8 +98,6 @@ struct user_beancounter {
 	spinlock_t		ub_lock;
 	const char		*ub_name;
 
-	unsigned long		ub_flags;
-
 	struct ratelimit_state	ub_ratelimit;
 
 	atomic_long_t		dirty_pages;
@@ -117,10 +115,6 @@ struct user_beancounter {
 	struct ub_percpu_struct	*ub_percpu;
 };
 
-enum ub_flags {
-	UB_DIRTY_EXCEEDED,
-};
-
 extern int ub_count;
 
 enum ub_severity { UB_HARD, UB_SOFT, UB_FORCE };
diff --git a/kernel/ve/vziolimit.c b/kernel/ve/vziolimit.c
index 628ec80..ecd8438 100644
--- a/kernel/ve/vziolimit.c
+++ b/kernel/ve/vziolimit.c
@@ -154,8 +154,6 @@ static void iolimit_balance_dirty(struct iolimit *iolimit,
 	spin_lock_irqsave(&ub->ub_lock, flags);
 	/* precharge dirty pages */
 	throttle_charge(th, (long long)dirty << PAGE_SHIFT);
-	/* set dirty_exceeded for smooth throttling */
-	set_bit(UB_DIRTY_EXCEEDED, &ub->ub_flags);
 	spin_unlock_irqrestore(&ub->ub_lock, flags);
 }