X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Fdt_object.c;h=75f44f33c1c54ed78136e4b81f9908956f8b1443;hp=afe90d365c758fe5c197065585e68c77ff1c2348;hb=21d716e6c16424d9deb646456758ebbaa9c70fec;hpb=8931d9070415e808e09bb4befd7cd38ef2431149 diff --git a/lustre/obdclass/dt_object.c b/lustre/obdclass/dt_object.c index afe90d3..75f44f3 100644 --- a/lustre/obdclass/dt_object.c +++ b/lustre/obdclass/dt_object.c @@ -296,22 +296,21 @@ dt_store_resolve(const struct lu_env *env, struct dt_device *dt, struct dt_thread_info *info = dt_info(env); struct dt_find_hint *dfh = &info->dti_dfh; struct dt_object *obj; - char *local = info->dti_buf; int result; dfh->dfh_dt = dt; dfh->dfh_fid = fid; - strncpy(local, path, DT_MAX_PATH); - local[DT_MAX_PATH - 1] = '\0'; + strlcpy(info->dti_buf, path, sizeof(info->dti_buf)); result = dt->dd_ops->dt_root_get(env, dt, fid); if (result == 0) { obj = dt_locate(env, dt, fid); if (!IS_ERR(obj)) { dfh->dfh_o = obj; - result = dt_path_parser(env, local, dt_find_entry, dfh); + result = dt_path_parser(env, info->dti_buf, + dt_find_entry, dfh); if (result != 0) obj = ERR_PTR(result); else @@ -567,6 +566,17 @@ EXPORT_SYMBOL(dt_directory_features); const struct dt_index_features dt_otable_features; EXPORT_SYMBOL(dt_otable_features); +/* lfsck orphan */ +const struct dt_index_features dt_lfsck_orphan_features = { + .dif_flags = 0, + .dif_keysize_min = sizeof(struct lu_fid), + .dif_keysize_max = sizeof(struct lu_fid), + .dif_recsize_min = sizeof(struct lu_orphan_rec), + .dif_recsize_max = sizeof(struct lu_orphan_rec), + .dif_ptrsize = 4 +}; +EXPORT_SYMBOL(dt_lfsck_orphan_features); + /* lfsck */ const struct dt_index_features dt_lfsck_features = { .dif_flags = DT_IND_UPDATE, @@ -630,6 +640,8 @@ static inline const struct dt_index_features *dt_index_feat_select(__u64 seq, /* slave index should be a regular file */ return ERR_PTR(-ENOENT); return &dt_quota_slv_features; + } else if (seq == FID_SEQ_LAYOUT_RBTREE){ + return &dt_lfsck_orphan_features; } else if (seq >= FID_SEQ_NORMAL) { /* object is part of the namespace, verify that it is a * directory */ @@ -664,10 +676,6 @@ static int dt_index_page_build(const struct lu_env *env, union lu_page *lp, int rc, size; ENTRY; - /* no support for variable key & record size for now */ - LASSERT((ii->ii_flags & II_FL_VARKEY) == 0); - LASSERT((ii->ii_flags & II_FL_VARREC) == 0); - /* initialize the header of the new container */ memset(lip, 0, LIP_HDR_SIZE); lip->lip_magic = LIP_MAGIC; @@ -683,7 +691,9 @@ static int dt_index_page_build(const struct lu_env *env, union lu_page *lp, do { char *tmp_entry = entry; struct dt_key *key; - __u64 hash; + __u64 hash; + __u16 keysize; + __u16 recsize; /* fetch 64-bit hash value */ hash = iops->store(env, it); @@ -700,18 +710,24 @@ static int dt_index_page_build(const struct lu_env *env, union lu_page *lp, GOTO(out, rc = 0); } - if ((ii->ii_flags & II_FL_NOHASH) == 0) { + if (!(ii->ii_flags & II_FL_NOHASH)) { /* client wants to the 64-bit hash value associated with * each record */ memcpy(tmp_entry, &hash, sizeof(hash)); tmp_entry += sizeof(hash); } - /* then the key value */ - LASSERT(iops->key_size(env, it) == ii->ii_keysize); - key = iops->key(env, it); - memcpy(tmp_entry, key, ii->ii_keysize); - tmp_entry += ii->ii_keysize; + if (ii->ii_flags & II_FL_VARKEY) + keysize = iops->key_size(env, it); + else + keysize = ii->ii_keysize; + + if (!(ii->ii_flags & II_FL_NOKEY)) { + /* then the key value */ + key = iops->key(env, it); + memcpy(tmp_entry, key, keysize); + tmp_entry += keysize; + } /* and finally the record */ rc = iops->rec(env, it, (struct dt_rec *)tmp_entry, attr); @@ -723,7 +739,13 @@ static int dt_index_page_build(const struct lu_env *env, union lu_page *lp, lip->lip_nr++; if (unlikely(lip->lip_nr == 1 && ii->ii_count == 0)) ii->ii_hash_start = hash; - entry = tmp_entry + ii->ii_recsize; + + if (ii->ii_flags & II_FL_VARREC) + recsize = iops->rec_size(env, it, attr); + else + recsize = ii->ii_recsize; + + entry = tmp_entry + recsize; nob -= size; } @@ -745,6 +767,7 @@ out: return rc; } + /* * Walk index and fill lu_page containers with key/record pairs * @@ -797,6 +820,10 @@ int dt_index_walk(const struct lu_env *env, struct dt_object *obj, rc = iops->next(env, it); } else if (rc > 0) { rc = 0; + } else { + if (rc == -ENODATA) + rc = 0; + GOTO(out, rc); } /* Fill containers one after the other. There might be multiple @@ -828,6 +855,7 @@ int dt_index_walk(const struct lu_env *env, struct dt_object *obj, kunmap(rdpg->rp_pages[i]); } +out: iops->put(env, it); iops->fini(env, it); @@ -865,15 +893,10 @@ int dt_index_read(const struct lu_env *env, struct dt_device *dev, if (rdpg->rp_count <= 0 && (rdpg->rp_count & (LU_PAGE_SIZE - 1)) != 0) RETURN(-EFAULT); - if (fid_seq(&ii->ii_fid) >= FID_SEQ_NORMAL) - /* we don't support directory transfer via OBD_IDX_READ for the - * time being */ + if (!fid_is_quota(&ii->ii_fid) && !fid_is_layout_rbtree(&ii->ii_fid) && + !fid_is_norm(&ii->ii_fid)) RETURN(-EOPNOTSUPP); - if (!fid_is_quota(&ii->ii_fid)) - /* block access to all local files except quota files */ - RETURN(-EPERM); - /* lookup index object subject to the transfer */ obj = dt_locate(env, dev, &ii->ii_fid); if (IS_ERR(obj)) @@ -895,35 +918,29 @@ int dt_index_read(const struct lu_env *env, struct dt_device *dev, } /* fill ii_flags with supported index features */ - ii->ii_flags &= II_FL_NOHASH; - - ii->ii_keysize = feat->dif_keysize_max; - if ((feat->dif_flags & DT_IND_VARKEY) != 0) { - /* key size is variable */ - ii->ii_flags |= II_FL_VARKEY; - /* we don't support variable key size for the time being */ - GOTO(out, rc = -EOPNOTSUPP); - } + ii->ii_flags &= (II_FL_NOHASH | II_FL_NOKEY | II_FL_VARKEY | + II_FL_VARREC); - ii->ii_recsize = feat->dif_recsize_max; - if ((feat->dif_flags & DT_IND_VARREC) != 0) { - /* record size is variable */ - ii->ii_flags |= II_FL_VARREC; - /* we don't support variable record size for the time being */ - GOTO(out, rc = -EOPNOTSUPP); - } + if (!(feat->dif_flags & DT_IND_VARKEY)) + ii->ii_keysize = feat->dif_keysize_max; + + if (!(feat->dif_flags & DT_IND_VARREC)) + ii->ii_recsize = feat->dif_recsize_max; - if ((feat->dif_flags & DT_IND_NONUNQ) != 0) + if (!(feat->dif_flags & DT_IND_NONUNQ)) /* key isn't necessarily unique */ ii->ii_flags |= II_FL_NONUNQ; - dt_read_lock(env, obj, 0); - /* fetch object version before walking the index */ - ii->ii_version = dt_version_get(env, obj); + if (!fid_is_layout_rbtree(&ii->ii_fid)) { + dt_read_lock(env, obj, 0); + /* fetch object version before walking the index */ + ii->ii_version = dt_version_get(env, obj); + } /* walk the index and fill lu_idxpages with key/record pairs */ - rc = dt_index_walk(env, obj, rdpg, dt_index_page_build ,ii); - dt_read_unlock(env, obj); + rc = dt_index_walk(env, obj, rdpg, dt_index_page_build, ii); + if (!fid_is_layout_rbtree(&ii->ii_fid)) + dt_read_unlock(env, obj); if (rc == 0) { /* index is empty */ @@ -939,7 +956,7 @@ out: EXPORT_SYMBOL(dt_index_read); #ifdef LPROCFS - +#ifndef HAVE_ONLY_PROCFS_SEQ int lprocfs_dt_rd_blksize(char *page, char **start, off_t off, int count, int *eof, void *data) { @@ -1054,5 +1071,99 @@ int lprocfs_dt_rd_filesfree(char *page, char **start, off_t off, return rc; } EXPORT_SYMBOL(lprocfs_dt_rd_filesfree); +#endif + +int lprocfs_dt_blksize_seq_show(struct seq_file *m, void *v) +{ + struct dt_device *dt = m->private; + struct obd_statfs osfs; + + int rc = dt_statfs(NULL, dt, &osfs); + if (rc == 0) + seq_printf(m, "%u\n", (unsigned) osfs.os_bsize); + return rc; +} +EXPORT_SYMBOL(lprocfs_dt_blksize_seq_show); + +int lprocfs_dt_kbytestotal_seq_show(struct seq_file *m, void *v) +{ + struct dt_device *dt = m->private; + struct obd_statfs osfs; + + int rc = dt_statfs(NULL, dt, &osfs); + if (rc == 0) { + __u32 blk_size = osfs.os_bsize >> 10; + __u64 result = osfs.os_blocks; + + while (blk_size >>= 1) + result <<= 1; + + seq_printf(m, LPU64"\n", result); + } + return rc; +} +EXPORT_SYMBOL(lprocfs_dt_kbytestotal_seq_show); + +int lprocfs_dt_kbytesfree_seq_show(struct seq_file *m, void *v) +{ + struct dt_device *dt = m->private; + struct obd_statfs osfs; + + int rc = dt_statfs(NULL, dt, &osfs); + if (rc == 0) { + __u32 blk_size = osfs.os_bsize >> 10; + __u64 result = osfs.os_bfree; + + while (blk_size >>= 1) + result <<= 1; + + seq_printf(m, LPU64"\n", result); + } + return rc; +} +EXPORT_SYMBOL(lprocfs_dt_kbytesfree_seq_show); + +int lprocfs_dt_kbytesavail_seq_show(struct seq_file *m, void *v) +{ + struct dt_device *dt = m->private; + struct obd_statfs osfs; + + int rc = dt_statfs(NULL, dt, &osfs); + if (rc == 0) { + __u32 blk_size = osfs.os_bsize >> 10; + __u64 result = osfs.os_bavail; + + while (blk_size >>= 1) + result <<= 1; + + seq_printf(m, LPU64"\n", result); + } + return rc; +} +EXPORT_SYMBOL(lprocfs_dt_kbytesavail_seq_show); + +int lprocfs_dt_filestotal_seq_show(struct seq_file *m, void *v) +{ + struct dt_device *dt = m->private; + struct obd_statfs osfs; + + int rc = dt_statfs(NULL, dt, &osfs); + if (rc == 0) + seq_printf(m, LPU64"\n", osfs.os_files); + return rc; +} +EXPORT_SYMBOL(lprocfs_dt_filestotal_seq_show); + +int lprocfs_dt_filesfree_seq_show(struct seq_file *m, void *v) +{ + struct dt_device *dt = m->private; + struct obd_statfs osfs; + + int rc = dt_statfs(NULL, dt, &osfs); + if (rc == 0) + seq_printf(m, LPU64"\n", osfs.os_ffree); + return rc; +} +EXPORT_SYMBOL(lprocfs_dt_filesfree_seq_show); #endif /* LPROCFS */