* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2013, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
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);
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;
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;
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);
/* this differs from dt_locate by top_dev as parameter
* but not one from lu_site */
struct dt_object *dt_locate_at(const struct lu_env *env,
- struct dt_device *dev, const struct lu_fid *fid,
- struct lu_device *top_dev)
+ struct dt_device *dev,
+ const struct lu_fid *fid,
+ struct lu_device *top_dev,
+ const struct lu_object_conf *conf)
{
- struct lu_object *lo, *n;
- ENTRY;
+ struct lu_object *lo;
+ struct lu_object *n;
- lo = lu_object_find_at(env, top_dev, fid, NULL);
+ lo = lu_object_find_at(env, top_dev, fid, conf);
if (IS_ERR(lo))
- return (void *)lo;
+ return ERR_PTR(PTR_ERR(lo));
LASSERT(lo != NULL);
- cfs_list_for_each_entry(n, &lo->lo_header->loh_layers, lo_linkage) {
+ list_for_each_entry(n, &lo->lo_header->loh_layers, lo_linkage) {
if (n->lo_dev == &dev->dd_lu_dev)
return container_of0(n, struct dt_object, do_lu);
}
+
return ERR_PTR(-ENOENT);
}
EXPORT_SYMBOL(dt_locate_at);
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
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,
/* 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 */
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;
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);
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);
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;
}
return rc;
}
+
/*
* Walk index and fill lu_page containers with key/record pairs
*
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
int i;
LASSERT(pageidx < rdpg->rp_npages);
- lp = cfs_kmap(rdpg->rp_pages[pageidx]);
+ lp = kmap(rdpg->rp_pages[pageidx]);
/* fill lu pages */
for (i = 0; i < LU_PAGE_COUNT; i++, lp++, nob -= LU_PAGE_SIZE) {
/* end of index */
break;
}
- cfs_kunmap(rdpg->rp_pages[i]);
+ kunmap(rdpg->rp_pages[i]);
}
+out:
iops->put(env, it);
iops->fini(env, it);
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))
}
/* 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;
- 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 */
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 obd_statfs osfs;
int rc = dt_statfs(NULL, dt, &osfs);
- if (rc != 0) {
+ if (rc == 0) {
*eof = 1;
- rc = snprintf(page, count, "%d\n",
+ rc = snprintf(page, count, "%u\n",
(unsigned) osfs.os_bsize);
}
struct obd_statfs osfs;
int rc = dt_statfs(NULL, dt, &osfs);
- if (rc != 0) {
+ if (rc == 0) {
__u32 blk_size = osfs.os_bsize >> 10;
__u64 result = osfs.os_blocks;
struct obd_statfs osfs;
int rc = dt_statfs(NULL, dt, &osfs);
- if (rc != 0) {
+ if (rc == 0) {
__u32 blk_size = osfs.os_bsize >> 10;
__u64 result = osfs.os_bfree;
struct obd_statfs osfs;
int rc = dt_statfs(NULL, dt, &osfs);
- if (rc != 0) {
+ if (rc == 0) {
__u32 blk_size = osfs.os_bsize >> 10;
__u64 result = osfs.os_bavail;
struct obd_statfs osfs;
int rc = dt_statfs(NULL, dt, &osfs);
- if (rc != 0) {
+ if (rc == 0) {
*eof = 1;
rc = snprintf(page, count, LPU64"\n", osfs.os_files);
}
struct obd_statfs osfs;
int rc = dt_statfs(NULL, dt, &osfs);
- if (rc != 0) {
+ 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;
+ 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 */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff