[Devel] [PATCH RHEL7 COMMIT] ploop: Remove excess variable

Konstantin Khorenko khorenko at virtuozzo.com
Fri Mar 22 19:38:00 MSK 2019


The commit is pushed to "branch-rh7-3.10.0-957.10.1.vz7.85.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-957.10.1.vz7.85.2
------>
commit 912a35aec04de8589664190473b240d7660fe344
Author: Kirill Tkhai <ktkhai at virtuozzo.com>
Date:   Fri Mar 22 19:37:58 2019 +0300

    ploop: Remove excess variable
    
    We may use saved_ioc to differ the case, when we need
    to put io context. We do not need duplicated variable
    for that.
    
    Signed-off-by: Kirill Tkhai <ktkhai at virtuozzo.com>
---
 drivers/block/ploop/dev.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/block/ploop/dev.c b/drivers/block/ploop/dev.c
index f8b9b0bcba78..1d6ee2329bb9 100644
--- a/drivers/block/ploop/dev.c
+++ b/drivers/block/ploop/dev.c
@@ -2565,7 +2565,6 @@ static void ploop_req_state_process(struct ploop_request * preq)
 	struct ploop_device * plo = preq->plo;
 	struct ploop_delta * top_delta;
 	struct io_context * saved_ioc = NULL;
-	int release_ioc = 0;
 #ifdef CONFIG_BEANCOUNTERS
 	struct user_beancounter *saved_ub = NULL;
 #endif
@@ -2576,7 +2575,6 @@ static void ploop_req_state_process(struct ploop_request * preq)
 		saved_ioc = current->io_context;
 		current->io_context = preq->ioc;
 		atomic_long_inc(&preq->ioc->refcount);
-		release_ioc = 1;
 	}
 #ifdef CONFIG_BEANCOUNTERS
 	WARN_ONCE(!preq->preq_ub,
@@ -2908,7 +2906,7 @@ static void ploop_req_state_process(struct ploop_request * preq)
 		BUG();
 	}
 out:
-	if (release_ioc) {
+	if (saved_ioc) {
 		struct io_context * ioc = current->io_context;
 		current->io_context = saved_ioc;
 		put_io_context(ioc);



More information about the Devel mailing list