diff options
Diffstat (limited to 'xlators/cluster/dht')
| -rw-r--r-- | xlators/cluster/dht/src/dht-common.c | 33 | 
1 files changed, 27 insertions, 6 deletions
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index 35b273e8875..8fa93fa076b 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -2727,12 +2727,12 @@ unlock:  int  dht_statfs (call_frame_t *frame, xlator_t *this, loc_t *loc)  { +        xlator_t     *subvol = NULL;          dht_local_t  *local  = NULL;          dht_conf_t   *conf = NULL;          int           op_errno = -1;          int           i = -1; -          VALIDATE_OR_GOTO (frame, err);          VALIDATE_OR_GOTO (this, err);          VALIDATE_OR_GOTO (loc, err); @@ -2743,14 +2743,35 @@ dht_statfs (call_frame_t *frame, xlator_t *this, loc_t *loc)          conf = this->private;          local = dht_local_init (frame); -        local->call_cnt = conf->subvolume_cnt; +        if (!local) { +                op_errno = ENOMEM; +                goto err; +        } -        for (i = 0; i < conf->subvolume_cnt; i++) { -                STACK_WIND (frame, dht_statfs_cbk, -                            conf->subvolumes[i], -                            conf->subvolumes[i]->fops->statfs, loc); +        if (IA_ISDIR (loc->inode->ia_type)) { +                local->call_cnt = conf->subvolume_cnt; + +                for (i = 0; i < conf->subvolume_cnt; i++) { +                        STACK_WIND (frame, dht_statfs_cbk, +                                    conf->subvolumes[i], +                                    conf->subvolumes[i]->fops->statfs, loc); +                } +                return 0; +        } + +        subvol = dht_subvol_get_cached (this, loc->inode); +        if (!subvol) { +                gf_log (this->name, GF_LOG_DEBUG, +                        "no cached subvolume for path=%s", loc->path); +                op_errno = EINVAL; +                goto err;          } +        local->call_cnt = 1; + +        STACK_WIND (frame, dht_statfs_cbk, +                    subvol, subvol->fops->statfs, loc); +          return 0;  err:  | 
