[Devel] [PATCH RHEL7 COMMIT] fs/aio-nr: fix decrement of aio-nr

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-327.18.2.vz7.14.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-327.18.2.vz7.14.9
------>
commit 7ae1fa66bbb940289a27d5922cad0ce394dd515e
Author: Andrey Ryabinin <aryabinin at virtuozzo.com>
Date:   Tue May 31 12:56:37 2016 +0400

    fs/aio-nr: fix decrement of aio-nr
    
    Commit 280363c ("fs/aio: show real number of aio events in fs.aio-nr sysctl")
    changed only incrementing of fs.aio-nr counter. It failed to update
    decrement path which leads to constant growing of fs.aio-nr value.
    
    Fixes commit 280363c ("fs/aio: show real number of aio events in fs.aio-nr
    sysctl").
    
    https://jira.sw.ru/browse/PSBM-47209
    
    Signed-off-by: Andrey Ryabinin <aryabinin at virtuozzo.com>
    Acked-by: Kirill Tkhai <ktkhai at virtuozzo.com>
---
 fs/aio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/aio.c b/fs/aio.c
index 0f00aa0..96f30d4 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -710,8 +710,8 @@ static int kill_ioctx(struct mm_struct *mm, struct kioctx *ctx,
 		 *  could tell).
 		 */
 		spin_lock(&ve->aio_nr_lock);
-		BUG_ON(ve->aio_nr - ctx->max_reqs > ve->aio_nr);
-		ve->aio_nr -= ctx->max_reqs;
+		BUG_ON(ve->aio_nr - ctx->nr_events > ve->aio_nr);
+		ve->aio_nr -= ctx->nr_events;
 		spin_unlock(&ve->aio_nr_lock);
 
 		if (ctx->mmap_size)