diff options
| author | Kinglong Mee <kinglongmee@gmail.com> | 2018-07-16 16:39:02 +0800 |
|---|---|---|
| committer | N Balachandran <nbalacha@redhat.com> | 2018-07-18 08:16:01 +0000 |
| commit | c63979fdd8589483f242a8f450a130d269e907ed (patch) | |
| tree | 0da2cbadecc795851795bb50ffcf46ebb01ef02d /xlators/cluster/dht/src/dht-inode-read.c | |
| parent | 6857d80a50823f5bd1be495edf6899d9bcba9f20 (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-inode-read.c')
| -rw-r--r-- | xlators/cluster/dht/src/dht-inode-read.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xlators/cluster/dht/src/dht-inode-read.c b/xlators/cluster/dht/src/dht-inode-read.c index 7e4aef4ccc6..53215a3d34d 100644 --- a/xlators/cluster/dht/src/dht-inode-read.c +++ b/xlators/cluster/dht/src/dht-inode-read.c @@ -299,7 +299,7 @@ dht_attr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, goto unlock; } - dht_iatt_merge (this, &local->stbuf, stbuf, prev); + dht_iatt_merge (this, &local->stbuf, stbuf); local->op_ret = 0; } @@ -877,8 +877,8 @@ dht_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int op_ret, if (local->call_cnt != 1) { if (local->stbuf.ia_blocks) { - dht_iatt_merge (this, postbuf, &local->stbuf, NULL); - dht_iatt_merge (this, prebuf, &local->prebuf, NULL); + dht_iatt_merge (this, postbuf, &local->stbuf); + dht_iatt_merge (this, prebuf, &local->prebuf); } goto out; } @@ -899,8 +899,8 @@ dht_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int op_ret, /* Check if the rebalance phase1 is true */ if (IS_DHT_MIGRATION_PHASE1 (postbuf)) { - dht_iatt_merge (this, &local->stbuf, postbuf, NULL); - dht_iatt_merge (this, &local->prebuf, prebuf, NULL); + dht_iatt_merge (this, &local->stbuf, postbuf); + dht_iatt_merge (this, &local->prebuf, prebuf); dht_inode_ctx_get_mig_info (this, inode, &src_subvol, &dst_subvol); |