190130
From 9c5f5b4ffd49e8c8631defb7b6873248bbfdaf9c Mon Sep 17 00:00:00 2001
190130
From: Rinku Kothiya <rkothiya@redhat.com>
190130
Date: Tue, 23 Jul 2019 13:16:04 +0000
190130
Subject: [PATCH 405/449] [core] fix return of local in  __nlc_inode_ctx_get
190130
190130
__nlc_inode_ctx_get assigns a value to nlc_pe_p which is never used by
190130
its parent function or any of the predecessor hence remove the
190130
assignment and also that function argument as it is not being used
190130
anywhere.
190130
190130
> fixes: bz#1732496
190130
> Change-Id: I5b950e1e251bd50a646616da872a4efe9d2ff8c9
190130
> (Cherry pick from commit 84a55090123a7e3124100e5564da8c521c3c22ab )
190130
> (Reviewed on upstream link https://review.gluster.org/#/c/glusterfs/+/23093/)
190130
190130
BUG: 1686897
190130
190130
Change-Id: I5b950e1e251bd50a646616da872a4efe9d2ff8c9
190130
Signed-off-by: Rinku Kothiya <rkothiya@redhat.com>
190130
Reviewed-on: https://code.engineering.redhat.com/gerrit/202372
190130
Tested-by: RHGS Build Bot <nigelb@redhat.com>
190130
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
190130
---
190130
 xlators/performance/nl-cache/src/nl-cache-helper.c | 36 +++++++++-------------
190130
 1 file changed, 14 insertions(+), 22 deletions(-)
190130
190130
diff --git a/xlators/performance/nl-cache/src/nl-cache-helper.c b/xlators/performance/nl-cache/src/nl-cache-helper.c
190130
index 009f33a..4314038 100644
190130
--- a/xlators/performance/nl-cache/src/nl-cache-helper.c
190130
+++ b/xlators/performance/nl-cache/src/nl-cache-helper.c
190130
@@ -145,12 +145,10 @@ nlc_disable_cache(xlator_t *this)
190130
 }
190130
 
190130
 static int
190130
-__nlc_inode_ctx_get(xlator_t *this, inode_t *inode, nlc_ctx_t **nlc_ctx_p,
190130
-                    nlc_pe_t **nlc_pe_p)
190130
+__nlc_inode_ctx_get(xlator_t *this, inode_t *inode, nlc_ctx_t **nlc_ctx_p)
190130
 {
190130
     int ret = 0;
190130
     nlc_ctx_t *nlc_ctx = NULL;
190130
-    nlc_pe_t *nlc_pe = NULL;
190130
     uint64_t nlc_ctx_int = 0;
190130
     uint64_t nlc_pe_int = 0;
190130
 
190130
@@ -159,10 +157,6 @@ __nlc_inode_ctx_get(xlator_t *this, inode_t *inode, nlc_ctx_t **nlc_ctx_p,
190130
         nlc_ctx = (void *)(long)(nlc_ctx_int);
190130
         *nlc_ctx_p = nlc_ctx;
190130
     }
190130
-    if (ret == 0 && nlc_pe_p) {
190130
-        nlc_pe = (void *)(long)(nlc_pe_int);
190130
-        *nlc_pe_p = nlc_pe;
190130
-    }
190130
     return ret;
190130
 }
190130
 
190130
@@ -186,14 +180,13 @@ nlc_inode_ctx_set(xlator_t *this, inode_t *inode, nlc_ctx_t *nlc_ctx,
190130
 }
190130
 
190130
 static void
190130
-nlc_inode_ctx_get(xlator_t *this, inode_t *inode, nlc_ctx_t **nlc_ctx_p,
190130
-                  nlc_pe_t **nlc_pe_p)
190130
+nlc_inode_ctx_get(xlator_t *this, inode_t *inode, nlc_ctx_t **nlc_ctx_p)
190130
 {
190130
     int ret = 0;
190130
 
190130
     LOCK(&inode->lock);
190130
     {
190130
-        ret = __nlc_inode_ctx_get(this, inode, nlc_ctx_p, nlc_pe_p);
190130
+        ret = __nlc_inode_ctx_get(this, inode, nlc_ctx_p);
190130
         if (ret < 0)
190130
             gf_msg_debug(this->name, 0,
190130
                          "inode ctx get failed for "
190130
@@ -290,8 +283,7 @@ out:
190130
 }
190130
 
190130
 static nlc_ctx_t *
190130
-nlc_inode_ctx_get_set(xlator_t *this, inode_t *inode, nlc_ctx_t **nlc_ctx_p,
190130
-                      nlc_pe_t **nlc_pe_p)
190130
+nlc_inode_ctx_get_set(xlator_t *this, inode_t *inode, nlc_ctx_t **nlc_ctx_p)
190130
 {
190130
     int ret = 0;
190130
     nlc_ctx_t *nlc_ctx = NULL;
190130
@@ -301,7 +293,7 @@ nlc_inode_ctx_get_set(xlator_t *this, inode_t *inode, nlc_ctx_t **nlc_ctx_p,
190130
 
190130
     LOCK(&inode->lock);
190130
     {
190130
-        ret = __nlc_inode_ctx_get(this, inode, &nlc_ctx, nlc_pe_p);
190130
+        ret = __nlc_inode_ctx_get(this, inode, &nlc_ctx);
190130
         if (nlc_ctx)
190130
             goto unlock;
190130
 
190130
@@ -410,7 +402,7 @@ nlc_set_dir_state(xlator_t *this, inode_t *inode, uint64_t state)
190130
         goto out;
190130
     }
190130
 
190130
-    nlc_inode_ctx_get_set(this, inode, &nlc_ctx, NULL);
190130
+    nlc_inode_ctx_get_set(this, inode, &nlc_ctx);
190130
     if (!nlc_ctx)
190130
         goto out;
190130
 
190130
@@ -430,7 +422,7 @@ nlc_cache_timeout_handler(struct gf_tw_timer_list *timer, void *data,
190130
     nlc_timer_data_t *tmp = data;
190130
     nlc_ctx_t *nlc_ctx = NULL;
190130
 
190130
-    nlc_inode_ctx_get(tmp->this, tmp->inode, &nlc_ctx, NULL);
190130
+    nlc_inode_ctx_get(tmp->this, tmp->inode, &nlc_ctx);
190130
     if (!nlc_ctx)
190130
         goto out;
190130
 
190130
@@ -696,7 +688,7 @@ nlc_inode_clear_cache(xlator_t *this, inode_t *inode, int reason)
190130
 {
190130
     nlc_ctx_t *nlc_ctx = NULL;
190130
 
190130
-    nlc_inode_ctx_get(this, inode, &nlc_ctx, NULL);
190130
+    nlc_inode_ctx_get(this, inode, &nlc_ctx);
190130
     if (!nlc_ctx)
190130
         goto out;
190130
 
190130
@@ -883,7 +875,7 @@ nlc_dir_add_ne(xlator_t *this, inode_t *inode, const char *name)
190130
         goto out;
190130
     }
190130
 
190130
-    nlc_inode_ctx_get_set(this, inode, &nlc_ctx, NULL);
190130
+    nlc_inode_ctx_get_set(this, inode, &nlc_ctx);
190130
     if (!nlc_ctx)
190130
         goto out;
190130
 
190130
@@ -914,7 +906,7 @@ nlc_dir_remove_pe(xlator_t *this, inode_t *parent, inode_t *entry_ino,
190130
         goto out;
190130
     }
190130
 
190130
-    nlc_inode_ctx_get(this, parent, &nlc_ctx, NULL);
190130
+    nlc_inode_ctx_get(this, parent, &nlc_ctx);
190130
     if (!nlc_ctx)
190130
         goto out;
190130
 
190130
@@ -945,7 +937,7 @@ nlc_dir_add_pe(xlator_t *this, inode_t *inode, inode_t *entry_ino,
190130
         goto out;
190130
     }
190130
 
190130
-    nlc_inode_ctx_get_set(this, inode, &nlc_ctx, NULL);
190130
+    nlc_inode_ctx_get_set(this, inode, &nlc_ctx);
190130
     if (!nlc_ctx)
190130
         goto out;
190130
 
190130
@@ -1051,7 +1043,7 @@ nlc_is_negative_lookup(xlator_t *this, loc_t *loc)
190130
         goto out;
190130
     }
190130
 
190130
-    nlc_inode_ctx_get(this, inode, &nlc_ctx, NULL);
190130
+    nlc_inode_ctx_get(this, inode, &nlc_ctx);
190130
     if (!nlc_ctx)
190130
         goto out;
190130
 
190130
@@ -1102,7 +1094,7 @@ nlc_get_real_file_name(xlator_t *this, loc_t *loc, const char *fname,
190130
         goto out;
190130
     }
190130
 
190130
-    nlc_inode_ctx_get(this, inode, &nlc_ctx, NULL);
190130
+    nlc_inode_ctx_get(this, inode, &nlc_ctx);
190130
     if (!nlc_ctx)
190130
         goto out;
190130
 
190130
@@ -1152,7 +1144,7 @@ nlc_dump_inodectx(xlator_t *this, inode_t *inode)
190130
     nlc_ne_t *ne = NULL;
190130
     nlc_ne_t *tmp1 = NULL;
190130
 
190130
-    nlc_inode_ctx_get(this, inode, &nlc_ctx, NULL);
190130
+    nlc_inode_ctx_get(this, inode, &nlc_ctx);
190130
 
190130
     if (!nlc_ctx)
190130
         goto out;
190130
-- 
190130
1.8.3.1
190130