summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/dht/src/dht-selfheal.c
diff options
context:
space:
mode:
authorKinglong Mee <kinglongmee@gmail.com>2018-07-16 16:39:02 +0800
committerN Balachandran <nbalacha@redhat.com>2018-07-18 08:16:01 +0000
commitc63979fdd8589483f242a8f450a130d269e907ed (patch)
tree0da2cbadecc795851795bb50ffcf46ebb01ef02d /xlators/cluster/dht/src/dht-selfheal.c
parent6857d80a50823f5bd1be495edf6899d9bcba9f20 (diff)
dht: remove useless argument from dht_iatt_merge
The last using of the subvol argument has been removed at 4e1ec35ef4f7 ("core: fill 'ia_ino' from 'ia_gfid' in 'storage/posix' ......") 7 years ago (2011-06-16). Change-Id: I9788d79e2e40cc153cf2960e28c7c1c1033dc8f7 fixes: bz#1601683 Signed-off-by: Kinglong Mee <mijinlong@open-fs.com>
Diffstat (limited to 'xlators/cluster/dht/src/dht-selfheal.c')
-rw-r--r--xlators/cluster/dht/src/dht-selfheal.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/xlators/cluster/dht/src/dht-selfheal.c b/xlators/cluster/dht/src/dht-selfheal.c
index 2aa75bc..6c526bd 100644
--- a/xlators/cluster/dht/src/dht-selfheal.c
+++ b/xlators/cluster/dht/src/dht-selfheal.c
@@ -201,7 +201,7 @@ dht_refresh_layout_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
op_ret = dht_layout_merge (this, layout, prev,
op_ret, op_errno, xattr);
- dht_iatt_merge (this, &local->stbuf, stbuf, prev);
+ dht_iatt_merge (this, &local->stbuf, stbuf);
if (op_ret == -1) {
gf_uuid_unparse (local->loc.gfid, gfid);
@@ -698,7 +698,7 @@ dht_selfheal_dir_xattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
LOCK (&frame->lock);
{
- dht_iatt_merge (this, &local->stbuf, stbuf, subvol);
+ dht_iatt_merge (this, &local->stbuf, stbuf);
}
UNLOCK (&frame->lock);
@@ -1154,8 +1154,8 @@ dht_selfheal_dir_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
local->loc.path, gfid );
goto out;
}
- dht_iatt_merge (this, &local->preparent, preparent, prev);
- dht_iatt_merge (this, &local->postparent, postparent, prev);
+ dht_iatt_merge (this, &local->preparent, preparent);
+ dht_iatt_merge (this, &local->postparent, postparent);
ret = 0;
out:
@@ -1366,7 +1366,6 @@ dht_selfheal_dir_mkdir_lookup_cbk (call_frame_t *frame, void *cookie,
dht_layout_t *layout = NULL;
dht_conf_t *conf = 0;
loc_t *loc = NULL;
- xlator_t *prev = NULL;
int check_mds = 0;
int errst = 0;
int32_t mds_xattr_val[1] = {0};
@@ -1377,7 +1376,6 @@ dht_selfheal_dir_mkdir_lookup_cbk (call_frame_t *frame, void *cookie,
local = frame->local;
layout = local->layout;
loc = &local->loc;
- prev = cookie;
conf = this->private;
if (local->gfid)
@@ -1394,7 +1392,7 @@ dht_selfheal_dir_mkdir_lookup_cbk (call_frame_t *frame, void *cookie,
}
if (!op_ret) {
- dht_iatt_merge (this, &local->stbuf, stbuf, prev);
+ dht_iatt_merge (this, &local->stbuf, stbuf);
}
check_mds = dht_dict_get_array (xattr, conf->mds_xattr_key,
mds_xattr_val, 1, &errst);