X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fobdclass%2Fdt_object.c;h=83cf4fbb544ef435e0864ea1958bea7106b44e5b;hb=a2245cbf99d15a24605e355f26b7612895ae2287;hp=b1eba33cd27db0a60a3f49e01e6642b0cc44dde3;hpb=77eea1985bb1655e58c8b7df00703b4f08b58ec7;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/dt_object.c b/lustre/obdclass/dt_object.c index b1eba33..83cf4fb 100644 --- a/lustre/obdclass/dt_object.c +++ b/lustre/obdclass/dt_object.c @@ -67,13 +67,13 @@ EXPORT_SYMBOL(dt_key); */ void dt_txn_callback_add(struct dt_device *dev, struct dt_txn_callback *cb) { - cfs_list_add(&cb->dtc_linkage, &dev->dd_txn_callbacks); + list_add(&cb->dtc_linkage, &dev->dd_txn_callbacks); } EXPORT_SYMBOL(dt_txn_callback_add); void dt_txn_callback_del(struct dt_device *dev, struct dt_txn_callback *cb) { - cfs_list_del_init(&cb->dtc_linkage); + list_del_init(&cb->dtc_linkage); } EXPORT_SYMBOL(dt_txn_callback_del); @@ -86,7 +86,7 @@ int dt_txn_hook_start(const struct lu_env *env, if (th->th_local) return 0; - cfs_list_for_each_entry(cb, &dev->dd_txn_callbacks, dtc_linkage) { + list_for_each_entry(cb, &dev->dd_txn_callbacks, dtc_linkage) { if (cb->dtc_txn_start == NULL || !(cb->dtc_tag & env->le_ctx.lc_tags)) continue; @@ -107,7 +107,7 @@ int dt_txn_hook_stop(const struct lu_env *env, struct thandle *txn) if (txn->th_local) return 0; - cfs_list_for_each_entry(cb, &dev->dd_txn_callbacks, dtc_linkage) { + list_for_each_entry(cb, &dev->dd_txn_callbacks, dtc_linkage) { if (cb->dtc_txn_stop == NULL || !(cb->dtc_tag & env->le_ctx.lc_tags)) continue; @@ -121,24 +121,23 @@ EXPORT_SYMBOL(dt_txn_hook_stop); void dt_txn_hook_commit(struct thandle *txn) { - struct dt_txn_callback *cb; + struct dt_txn_callback *cb; - if (txn->th_local) - return; + if (txn->th_local) + return; - cfs_list_for_each_entry(cb, &txn->th_dev->dd_txn_callbacks, - dtc_linkage) { - if (cb->dtc_txn_commit) - cb->dtc_txn_commit(txn, cb->dtc_cookie); - } + list_for_each_entry(cb, &txn->th_dev->dd_txn_callbacks, + dtc_linkage) { + if (cb->dtc_txn_commit) + cb->dtc_txn_commit(txn, cb->dtc_cookie); + } } EXPORT_SYMBOL(dt_txn_hook_commit); int dt_device_init(struct dt_device *dev, struct lu_device_type *t) { - - CFS_INIT_LIST_HEAD(&dev->dd_txn_callbacks); - return lu_device_init(&dev->dd_lu_dev, t); + INIT_LIST_HEAD(&dev->dd_txn_callbacks); + return lu_device_init(&dev->dd_lu_dev, t); } EXPORT_SYMBOL(dt_device_init); @@ -296,22 +295,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 @@ -668,18 +666,18 @@ static inline const struct dt_index_features *dt_index_feat_select(__u64 seq, * \param arg - is a pointer to the idx_info structure */ static int dt_index_page_build(const struct lu_env *env, union lu_page *lp, - int nob, const struct dt_it_ops *iops, + size_t nob, const struct dt_it_ops *iops, struct dt_it *it, __u32 attr, void *arg) { struct idx_info *ii = (struct idx_info *)arg; struct lu_idxpage *lip = &lp->lp_idx; char *entry; - int rc, size; + size_t size; + int rc; 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); + if (nob < LIP_HDR_SIZE) + return -EINVAL; /* initialize the header of the new container */ memset(lip, 0, LIP_HDR_SIZE); @@ -696,7 +694,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); @@ -713,18 +713,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); @@ -736,7 +742,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; } @@ -758,6 +770,7 @@ out: return rc; } + /* * Walk index and fill lu_page containers with key/record pairs * @@ -777,7 +790,7 @@ int dt_index_walk(const struct lu_env *env, struct dt_object *obj, { struct dt_it *it; const struct dt_it_ops *iops; - unsigned int pageidx, nob, nlupgs = 0; + size_t pageidx, nob, nlupgs = 0; int rc; ENTRY; @@ -785,7 +798,7 @@ int dt_index_walk(const struct lu_env *env, struct dt_object *obj, LASSERT(obj->do_index_ops != NULL); nob = rdpg->rp_count; - if (nob <= 0) + if (nob == 0) RETURN(-EFAULT); /* Iterate through index and fill containers from @rdpg */ @@ -810,6 +823,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,7 +845,7 @@ int dt_index_walk(const struct lu_env *env, struct dt_object *obj, /* fill lu pages */ for (i = 0; i < LU_PAGE_COUNT; i++, lp++, nob -= LU_PAGE_SIZE) { - rc = filler(env, lp, min_t(int, nob, LU_PAGE_SIZE), + rc = filler(env, lp, min_t(size_t, nob, LU_PAGE_SIZE), iops, it, rdpg->rp_attrs, arg); if (rc < 0) break; @@ -841,11 +858,12 @@ 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); if (rc >= 0) - rc = min_t(unsigned int, nlupgs * LU_PAGE_SIZE, rdpg->rp_count); + rc = min_t(size_t, nlupgs * LU_PAGE_SIZE, rdpg->rp_count); RETURN(rc); } @@ -875,19 +893,13 @@ int dt_index_read(const struct lu_env *env, struct dt_device *dev, /* rp_count shouldn't be null and should be a multiple of the container * size */ - if (rdpg->rp_count <= 0 && (rdpg->rp_count & (LU_PAGE_SIZE - 1)) != 0) + 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) && !fid_is_layout_rbtree(&ii->ii_fid)) - /* Block access to all local files except quota files and - * layout brtree. */ - RETURN(-EPERM); - /* lookup index object subject to the transfer */ obj = dt_locate(env, dev, &ii->ii_fid); if (IS_ERR(obj)) @@ -909,25 +921,16 @@ 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_NONUNQ) != 0) + if (!(feat->dif_flags & DT_IND_VARREC)) + ii->ii_recsize = feat->dif_recsize_max; + + if (feat->dif_flags & DT_IND_NONUNQ) /* key isn't necessarily unique */ ii->ii_flags |= II_FL_NONUNQ; @@ -938,7 +941,7 @@ int dt_index_read(const struct lu_env *env, struct dt_device *dev, } /* walk the index and fill lu_idxpages with key/record pairs */ - rc = dt_index_walk(env, obj, rdpg, dt_index_page_build ,ii); + 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); @@ -956,123 +959,6 @@ 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) -{ - struct dt_device *dt = data; - struct obd_statfs osfs; - - int rc = dt_statfs(NULL, dt, &osfs); - if (rc == 0) { - *eof = 1; - rc = snprintf(page, count, "%u\n", - (unsigned) osfs.os_bsize); - } - - return rc; -} -EXPORT_SYMBOL(lprocfs_dt_rd_blksize); - -int lprocfs_dt_rd_kbytestotal(char *page, char **start, off_t off, - int count, int *eof, void *data) -{ - struct dt_device *dt = data; - 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; - - *eof = 1; - rc = snprintf(page, count, LPU64"\n", result); - } - - return rc; -} -EXPORT_SYMBOL(lprocfs_dt_rd_kbytestotal); - -int lprocfs_dt_rd_kbytesfree(char *page, char **start, off_t off, - int count, int *eof, void *data) -{ - struct dt_device *dt = data; - 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; - - *eof = 1; - rc = snprintf(page, count, LPU64"\n", result); - } - - return rc; -} -EXPORT_SYMBOL(lprocfs_dt_rd_kbytesfree); - -int lprocfs_dt_rd_kbytesavail(char *page, char **start, off_t off, - int count, int *eof, void *data) -{ - struct dt_device *dt = data; - 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; - - *eof = 1; - rc = snprintf(page, count, LPU64"\n", result); - } - - return rc; -} -EXPORT_SYMBOL(lprocfs_dt_rd_kbytesavail); - -int lprocfs_dt_rd_filestotal(char *page, char **start, off_t off, - int count, int *eof, void *data) -{ - struct dt_device *dt = data; - struct obd_statfs osfs; - - int rc = dt_statfs(NULL, dt, &osfs); - if (rc == 0) { - *eof = 1; - rc = snprintf(page, count, LPU64"\n", osfs.os_files); - } - - return rc; -} -EXPORT_SYMBOL(lprocfs_dt_rd_filestotal); - -int lprocfs_dt_rd_filesfree(char *page, char **start, off_t off, - int count, int *eof, void *data) -{ - struct dt_device *dt = data; - struct obd_statfs osfs; - - int rc = dt_statfs(NULL, dt, &osfs); - if (rc == 0) { - *eof = 1; - rc = snprintf(page, count, LPU64"\n", osfs.os_ffree); - } - - 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;