* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*
* lustre/osd/osd_compat.c
*
- * on-disk compatibility stuff for OST
+ * on-disk structure for managing /O
*
* Author: Alex Zhuravlev <bzzz@whamcloud.com>
*/
#include <lvfs.h>
#include "osd_internal.h"
-
-struct osd_compat_objid_seq {
- /* protects on-fly initialization */
- cfs_semaphore_t dir_init_sem;
- /* file storing last created objid */
- struct osd_inode_id last_id;
- struct dentry *groot; /* O/<seq> */
- struct dentry **dirs; /* O/<seq>/d0-dXX */
-};
-
-#define MAX_OBJID_GROUP (FID_SEQ_ECHO + 1)
-
-struct osd_compat_objid {
- int subdir_count;
- struct dentry *root;
- struct osd_inode_id last_rcvd_id;
- struct osd_inode_id last_seq_id;
- struct osd_compat_objid_seq groups[MAX_OBJID_GROUP];
-};
+#include "osd_oi.h"
static void osd_push_ctxt(const struct osd_device *dev,
struct lvfs_run_ctxt *newctxt,
push_ctxt(save, newctxt, NULL);
}
-void osd_compat_seq_fini(struct osd_device *osd, int seq)
+static void osd_pop_ctxt(const struct osd_device *dev,
+ struct lvfs_run_ctxt *new,
+ struct lvfs_run_ctxt *save)
{
- struct osd_compat_objid_seq *grp;
- struct osd_compat_objid *map = osd->od_ost_map;
- int i;
-
- ENTRY;
-
- grp = &map->groups[seq];
- if (grp->groot ==NULL)
- RETURN_EXIT;
- LASSERT(grp->dirs);
-
- for (i = 0; i < map->subdir_count; i++) {
- if (grp->dirs[i] == NULL)
- break;
- dput(grp->dirs[i]);
- }
-
- OBD_FREE(grp->dirs, sizeof(struct dentry *) * map->subdir_count);
- dput(grp->groot);
- EXIT;
-}
-
-int osd_compat_seq_init(struct osd_device *osd, int seq)
-{
- struct osd_compat_objid_seq *grp;
- struct osd_compat_objid *map;
- struct dentry *d;
- int rc = 0;
- char name[32];
- int i;
- ENTRY;
-
- map = osd->od_ost_map;
- LASSERT(map);
- LASSERT(map->root);
- grp = &map->groups[seq];
-
- if (grp->groot != NULL)
- RETURN(0);
-
- cfs_down(&grp->dir_init_sem);
-
- sprintf(name, "%d", seq);
- d = simple_mkdir(map->root, osd->od_mnt, name, 0755, 1);
- if (IS_ERR(d)) {
- rc = PTR_ERR(d);
- GOTO(out, rc);
- } else if (d->d_inode == NULL) {
- rc = -EFAULT;
- dput(d);
- GOTO(out, rc);
- }
-
- LASSERT(grp->dirs == NULL);
- OBD_ALLOC(grp->dirs, sizeof(d) * map->subdir_count);
- if (grp->dirs == NULL) {
- dput(d);
- GOTO(out, rc = -ENOMEM);
- }
-
- grp->groot = d;
- for (i = 0; i < map->subdir_count; i++) {
- sprintf(name, "d%d", i);
- d = simple_mkdir(grp->groot, osd->od_mnt, name, 0755, 1);
- if (IS_ERR(d)) {
- rc = PTR_ERR(d);
- break;
- } else if (d->d_inode == NULL) {
- rc = -EFAULT;
- dput(d);
- break;
- }
-
- grp->dirs[i] = d;
- }
-
- if (rc)
- osd_compat_seq_fini(osd, seq);
-out:
- cfs_up(&grp->dir_init_sem);
- RETURN(rc);
+ pop_ctxt(save, new, NULL);
}
int osd_last_rcvd_subdir_count(struct osd_device *osd)
struct dentry *dlast;
loff_t off;
int rc = 0;
- int count = 0;
+ int count = FILTER_SUBDIR_COUNT;
ENTRY;
CDEBUG(D_INFO, "read last_rcvd header, uuid = %s, "
"subdir count = %d\n", lsd.lsd_uuid,
lsd.lsd_subdir_count);
- count = le16_to_cpu(lsd.lsd_subdir_count);
- } else if (rc != 0) {
- CERROR("Can't read last_rcvd file, rc = %d\n", rc);
- if (rc > 0)
- rc = -EFAULT;
- goto out;
- } else {
- count = FILTER_SUBDIR_COUNT;
- }
-
- rc = count;
+ if (le16_to_cpu(lsd.lsd_subdir_count) > 0)
+ count = le16_to_cpu(lsd.lsd_subdir_count);
+ } else if (rc != 0) {
+ CERROR("Can't read last_rcvd file, rc = %d\n", rc);
+ if (rc > 0)
+ rc = -EFAULT;
+ dput(dlast);
+ return rc;
+ }
out:
- dput(dlast);
- return rc;
-}
-
-void osd_compat_fini(struct osd_device *dev)
-{
- int i;
-
- ENTRY;
-
- if (dev->od_ost_map == NULL)
- RETURN_EXIT;
-
- for (i = 0; i < MAX_OBJID_GROUP; i++)
- osd_compat_seq_fini(dev, i);
-
- dput(dev->od_ost_map->root);
- OBD_FREE_PTR(dev->od_ost_map);
- dev->od_ost_map = NULL;
-
- EXIT;
+ dput(dlast);
+ LASSERT(count > 0);
+ return count;
}
/*
* CONFIGS
*
*/
-int osd_compat_init(struct osd_device *dev)
+int osd_ost_init(struct osd_device *dev)
{
- struct lvfs_run_ctxt new;
- struct lvfs_run_ctxt save;
- struct dentry *rootd = osd_sb(dev)->s_root;
- struct dentry *d;
- int rc;
- int i;
-
- ENTRY;
-
- /* to get subdir count from last_rcvd */
- rc = osd_last_rcvd_subdir_count(dev);
- if (rc <= 0)
- RETURN(rc);
-
- dev->od_ost_map->subdir_count = rc;
+ struct lvfs_run_ctxt new;
+ struct lvfs_run_ctxt save;
+ struct dentry *rootd = osd_sb(dev)->s_root;
+ struct dentry *d;
+ int rc;
+ ENTRY;
+
+ OBD_ALLOC_PTR(dev->od_ost_map);
+ if (dev->od_ost_map == NULL)
+ RETURN(-ENOMEM);
+
+ /* to get subdir count from last_rcvd */
+ rc = osd_last_rcvd_subdir_count(dev);
+ if (rc < 0) {
+ OBD_FREE_PTR(dev->od_ost_map);
+ RETURN(rc);
+ }
+
+ dev->od_ost_map->om_subdir_count = rc;
rc = 0;
- OBD_ALLOC_PTR(dev->od_ost_map);
- if (dev->od_ost_map == NULL)
- RETURN(-ENOMEM);
+ CFS_INIT_LIST_HEAD(&dev->od_ost_map->om_seq_list);
+ rwlock_init(&dev->od_ost_map->om_seq_list_lock);
+ sema_init(&dev->od_ost_map->om_dir_init_sem, 1);
LASSERT(dev->od_fsops);
osd_push_ctxt(dev, &new, &save);
d = simple_mkdir(rootd, dev->od_mnt, "O", 0755, 1);
- pop_ctxt(&save, &new, NULL);
+ if (IS_ERR(d))
+ GOTO(cleanup, rc = PTR_ERR(d));
+
+ ldiskfs_set_inode_state(d->d_inode, LDISKFS_STATE_LUSTRE_NO_OI);
+ dev->od_ost_map->om_root = d;
+
+cleanup:
+ osd_pop_ctxt(dev, &new, &save);
if (IS_ERR(d)) {
OBD_FREE_PTR(dev->od_ost_map);
RETURN(PTR_ERR(d));
}
- dev->od_ost_map->root = d;
+ RETURN(rc);
+}
+
+static void osd_seq_free(struct osd_obj_map *map,
+ struct osd_obj_seq *osd_seq)
+{
+ int j;
- /* Initialize all groups */
- for (i = 0; i < MAX_OBJID_GROUP; i++) {
- cfs_sema_init(&dev->od_ost_map->groups[i].dir_init_sem, 1);
- rc = osd_compat_seq_init(dev, i);
- if (rc) {
- osd_compat_fini(dev);
- break;
+ cfs_list_del_init(&osd_seq->oos_seq_list);
+
+ if (osd_seq->oos_dirs) {
+ for (j = 0; j < osd_seq->oos_subdir_count; j++) {
+ if (osd_seq->oos_dirs[j])
+ dput(osd_seq->oos_dirs[j]);
}
+ OBD_FREE(osd_seq->oos_dirs,
+ sizeof(struct dentry *) * osd_seq->oos_subdir_count);
}
+ if (osd_seq->oos_root)
+ dput(osd_seq->oos_root);
+
+ OBD_FREE_PTR(osd_seq);
+}
+
+int osd_obj_map_init(struct osd_device *dev)
+{
+ int rc;
+ ENTRY;
+
+ /* prepare structures for OST */
+ rc = osd_ost_init(dev);
+
+ /* prepare structures for MDS */
+
RETURN(rc);
}
-int osd_compat_del_entry(struct osd_thread_info *info, struct osd_device *osd,
- struct dentry *dird, char *name, struct thandle *th)
+struct osd_obj_seq *osd_seq_find_locked(struct osd_obj_map *map, obd_seq seq)
+{
+ struct osd_obj_seq *osd_seq;
+
+ cfs_list_for_each_entry(osd_seq, &map->om_seq_list, oos_seq_list) {
+ if (osd_seq->oos_seq == seq)
+ return osd_seq;
+ }
+ return NULL;
+}
+
+struct osd_obj_seq *osd_seq_find(struct osd_obj_map *map, obd_seq seq)
+{
+ struct osd_obj_seq *osd_seq;
+
+ read_lock(&map->om_seq_list_lock);
+ osd_seq = osd_seq_find_locked(map, seq);
+ read_unlock(&map->om_seq_list_lock);
+ return osd_seq;
+}
+
+void osd_obj_map_fini(struct osd_device *dev)
+{
+ struct osd_obj_seq *osd_seq;
+ struct osd_obj_seq *tmp;
+ struct osd_obj_map *map = dev->od_ost_map;
+ ENTRY;
+
+ map = dev->od_ost_map;
+ if (map == NULL)
+ return;
+
+ write_lock(&dev->od_ost_map->om_seq_list_lock);
+ cfs_list_for_each_entry_safe(osd_seq, tmp,
+ &dev->od_ost_map->om_seq_list,
+ oos_seq_list) {
+ osd_seq_free(map, osd_seq);
+ }
+ write_unlock(&dev->od_ost_map->om_seq_list_lock);
+ if (map->om_root)
+ dput(map->om_root);
+ OBD_FREE_PTR(dev->od_ost_map);
+ dev->od_ost_map = NULL;
+ EXIT;
+}
+
+static int osd_obj_del_entry(struct osd_thread_info *info,
+ struct osd_device *osd,
+ struct dentry *dird, char *name,
+ struct thandle *th)
{
struct ldiskfs_dir_entry_2 *de;
struct buffer_head *bh;
child->d_parent = dird;
child->d_inode = NULL;
- LOCK_INODE_MUTEX(dir);
- rc = -ENOENT;
- bh = osd_ldiskfs_find_entry(dir, child, &de, NULL);
- if (bh) {
- rc = ldiskfs_delete_entry(oh->ot_handle, dir, de, bh);
- brelse(bh);
- }
- UNLOCK_INODE_MUTEX(dir);
-
- RETURN(rc);
+ ll_vfs_dq_init(dir);
+ mutex_lock(&dir->i_mutex);
+ rc = -ENOENT;
+ bh = osd_ldiskfs_find_entry(dir, child, &de, NULL);
+ if (bh) {
+ rc = ldiskfs_delete_entry(oh->ot_handle, dir, de, bh);
+ brelse(bh);
+ }
+ mutex_unlock(&dir->i_mutex);
+
+ RETURN(rc);
}
-int osd_compat_add_entry(struct osd_thread_info *info, struct osd_device *osd,
- struct dentry *dir, char *name,
- const struct osd_inode_id *id, struct thandle *th)
+int osd_obj_add_entry(struct osd_thread_info *info,
+ struct osd_device *osd,
+ struct dentry *dir, char *name,
+ const struct osd_inode_id *id,
+ struct thandle *th)
{
struct osd_thandle *oh;
struct dentry *child;
inode = &info->oti_inode;
inode->i_sb = osd_sb(osd);
- inode->i_ino = id->oii_ino;
- inode->i_generation = id->oii_gen;
+ osd_id_to_inode(inode, id);
+ inode->i_mode = S_IFREG; /* for type in ldiskfs dir entry */
child = &info->oti_child_dentry;
child->d_name.hash = 0;
child->d_parent = dir;
child->d_inode = inode;
- LOCK_INODE_MUTEX(dir->d_inode);
- rc = osd_ldiskfs_add_entry(oh->ot_handle, child, inode, NULL);
- UNLOCK_INODE_MUTEX(dir->d_inode);
+ ll_vfs_dq_init(dir->d_inode);
+ mutex_lock(&dir->d_inode->i_mutex);
+ rc = osd_ldiskfs_add_entry(oh->ot_handle, child, inode, NULL);
+ mutex_unlock(&dir->d_inode->i_mutex);
- RETURN(rc);
+ RETURN(rc);
}
-int osd_compat_objid_lookup(struct osd_thread_info *info,
- struct osd_device *dev, const struct lu_fid *fid,
- struct osd_inode_id *id)
+/**
+ * Use LPU64 for legacy OST sequences, but use LPX64i for new
+ * sequences names, so that the O/{seq}/dN/{oid} more closely
+ * follows the DFID/PFID format. This makes it easier to map from
+ * debug messages to objects in the future, and the legacy space
+ * of FID_SEQ_OST_MDT0 will be unused in the future.
+ **/
+static inline void osd_seq_name(char *seq_name, obd_seq seq)
{
- struct osd_compat_objid *map;
- struct dentry *d;
- struct dentry *d_seq;
- struct ost_id *ostid = &info->oti_ostid;
- int rc = 0;
- int dirn;
- char name[32];
- struct ldiskfs_dir_entry_2 *de;
- struct buffer_head *bh;
- struct inode *dir;
+ sprintf(seq_name, (fid_seq_is_rsvd(seq) ||
+ fid_seq_is_mdt0(seq)) ? LPU64 : LPX64i,
+ fid_seq_is_idif(seq) ? 0 : seq);
+}
+
+static inline void osd_oid_name(char *name, const struct lu_fid *fid, obd_id id)
+{
+ sprintf(name, (fid_seq_is_rsvd(fid_seq(fid)) ||
+ fid_seq_is_mdt0(fid_seq(fid)) ||
+ fid_seq_is_idif(fid_seq(fid))) ? LPU64 : LPX64i, id);
+}
+
+/* external locking is required */
+static int osd_seq_load_locked(struct osd_device *osd,
+ struct osd_obj_seq *osd_seq)
+{
+ struct osd_obj_map *map = osd->od_ost_map;
+ struct dentry *seq_dir;
+ int rc = 0;
+ int i;
+ char seq_name[32];
+ ENTRY;
+
+ if (osd_seq->oos_root != NULL)
+ RETURN(0);
+
+ LASSERT(map);
+ LASSERT(map->om_root);
+
+ osd_seq_name(seq_name, osd_seq->oos_seq);
+
+ seq_dir = simple_mkdir(map->om_root, osd->od_mnt, seq_name, 0755, 1);
+ if (IS_ERR(seq_dir))
+ GOTO(out_err, rc = PTR_ERR(seq_dir));
+ else if (seq_dir->d_inode == NULL)
+ GOTO(out_put, rc = -EFAULT);
+
+ ldiskfs_set_inode_state(seq_dir->d_inode, LDISKFS_STATE_LUSTRE_NO_OI);
+ osd_seq->oos_root = seq_dir;
+
+ LASSERT(osd_seq->oos_dirs == NULL);
+ OBD_ALLOC(osd_seq->oos_dirs,
+ sizeof(seq_dir) * osd_seq->oos_subdir_count);
+ if (osd_seq->oos_dirs == NULL)
+ GOTO(out_put, rc = -ENOMEM);
+
+ for (i = 0; i < osd_seq->oos_subdir_count; i++) {
+ struct dentry *dir;
+ char name[32];
+
+ sprintf(name, "d%u", i);
+ dir = simple_mkdir(osd_seq->oos_root, osd->od_mnt, name,
+ 0700, 1);
+ if (IS_ERR(dir)) {
+ rc = PTR_ERR(dir);
+ } else if (dir->d_inode) {
+ ldiskfs_set_inode_state(dir->d_inode,
+ LDISKFS_STATE_LUSTRE_NO_OI);
+ osd_seq->oos_dirs[i] = dir;
+ rc = 0;
+ } else {
+ LBUG();
+ }
+ }
+
+ if (rc != 0)
+ osd_seq_free(map, osd_seq);
+out_put:
+ if (rc != 0) {
+ dput(seq_dir);
+ osd_seq->oos_root = NULL;
+ }
+out_err:
+ RETURN(rc);
+}
+
+static struct osd_obj_seq *osd_seq_load(struct osd_device *osd, obd_seq seq)
+{
+ struct osd_obj_map *map;
+ struct osd_obj_seq *osd_seq;
+ int rc = 0;
+ ENTRY;
+
+ map = osd->od_ost_map;
+ LASSERT(map);
+ LASSERT(map->om_root);
+
+ osd_seq = osd_seq_find(map, seq);
+ if (likely(osd_seq != NULL))
+ RETURN(osd_seq);
+
+ /* Serializing init process */
+ down(&map->om_dir_init_sem);
+
+ /* Check whether the seq has been added */
+ read_lock(&map->om_seq_list_lock);
+ osd_seq = osd_seq_find_locked(map, seq);
+ if (osd_seq != NULL) {
+ read_unlock(&map->om_seq_list_lock);
+ GOTO(cleanup, rc = 0);
+ }
+ read_unlock(&map->om_seq_list_lock);
+
+ OBD_ALLOC_PTR(osd_seq);
+ if (osd_seq == NULL)
+ GOTO(cleanup, rc = -ENOMEM);
+
+ CFS_INIT_LIST_HEAD(&osd_seq->oos_seq_list);
+ osd_seq->oos_seq = seq;
+ /* Init subdir count to be 32, but each seq can have
+ * different subdir count */
+ osd_seq->oos_subdir_count = map->om_subdir_count;
+ rc = osd_seq_load_locked(osd, osd_seq);
+ if (rc != 0)
+ GOTO(cleanup, rc);
+
+ write_lock(&map->om_seq_list_lock);
+ cfs_list_add(&osd_seq->oos_seq_list, &map->om_seq_list);
+ write_unlock(&map->om_seq_list_lock);
+
+cleanup:
+ up(&map->om_dir_init_sem);
+ if (rc != 0) {
+ if (osd_seq != NULL)
+ OBD_FREE_PTR(osd_seq);
+ RETURN(ERR_PTR(rc));
+ }
+
+ RETURN(osd_seq);
+}
+
+int osd_obj_map_lookup(struct osd_thread_info *info, struct osd_device *dev,
+ const struct lu_fid *fid, struct osd_inode_id *id)
+{
+ struct osd_obj_map *map;
+ struct osd_obj_seq *osd_seq;
+ struct dentry *d_seq;
+ struct dentry *child;
+ struct ost_id *ostid = &info->oti_ostid;
+ int dirn;
+ char name[32];
+ struct ldiskfs_dir_entry_2 *de;
+ struct buffer_head *bh;
+ struct inode *dir;
+ struct inode *inode;
ENTRY;
/* on the very first lookup we find and open directories */
map = dev->od_ost_map;
LASSERT(map);
- LASSERT(map->root);
+ LASSERT(map->om_root);
fid_ostid_pack(fid, ostid);
- LASSERT(ostid->oi_seq < MAX_OBJID_GROUP);
- LASSERT(map->subdir_count > 0);
- LASSERT(map->groups[ostid->oi_seq].groot);
+ osd_seq = osd_seq_load(dev, ostid->oi_seq);
+ if (IS_ERR(osd_seq))
+ RETURN(PTR_ERR(osd_seq));
- dirn = ostid->oi_id & (map->subdir_count - 1);
- d = map->groups[ostid->oi_seq].dirs[dirn];
- LASSERT(d);
+ dirn = ostid->oi_id & (osd_seq->oos_subdir_count - 1);
+ d_seq = osd_seq->oos_dirs[dirn];
+ LASSERT(d_seq);
- sprintf(name, "%llu", ostid->oi_id);
- d_seq = &info->oti_child_dentry;
- d_seq->d_parent = d;
- d_seq->d_name.hash = 0;
- d_seq->d_name.name = name;
- /* XXX: we can use rc from sprintf() instead of strlen() */
- d_seq->d_name.len = strlen(name);
-
- dir = d->d_inode;
- LOCK_INODE_MUTEX(dir);
- bh = osd_ldiskfs_find_entry(dir, d_seq, &de, NULL);
- UNLOCK_INODE_MUTEX(dir);
-
- rc = -ENOENT;
- if (bh) {
- struct inode *inode;
-
- id->oii_ino = le32_to_cpu(de->inode);
- brelse(bh);
-
- id->oii_gen = OSD_OII_NOGEN;
- inode = osd_iget(info, dev, id);
-
- if (IS_ERR(inode))
- GOTO(cleanup, rc = PTR_ERR(inode));
- rc = 0;
- id->oii_gen = inode->i_generation;
- iput(inode);
- }
+ osd_oid_name(name, fid, ostid->oi_id);
-cleanup:
- RETURN(rc);
+ child = &info->oti_child_dentry;
+ child->d_parent = d_seq;
+ child->d_name.hash = 0;
+ child->d_name.name = name;
+ /* XXX: we can use rc from sprintf() instead of strlen() */
+ child->d_name.len = strlen(name);
+
+ dir = d_seq->d_inode;
+ mutex_lock(&dir->i_mutex);
+ bh = osd_ldiskfs_find_entry(dir, child, &de, NULL);
+ mutex_unlock(&dir->i_mutex);
+
+ if (bh == NULL)
+ RETURN(-ENOENT);
+
+ osd_id_gen(id, le32_to_cpu(de->inode), OSD_OII_NOGEN);
+ brelse(bh);
+
+ inode = osd_iget(info, dev, id);
+ if (IS_ERR(inode))
+ RETURN(PTR_ERR(inode));
+
+ iput(inode);
+ RETURN(0);
}
-int osd_compat_objid_insert(struct osd_thread_info *info,
- struct osd_device *osd,
- const struct lu_fid *fid,
- const struct osd_inode_id *id,
- struct thandle *th)
+int osd_obj_map_insert(struct osd_thread_info *info,
+ struct osd_device *osd,
+ const struct lu_fid *fid,
+ const struct osd_inode_id *id,
+ struct thandle *th)
{
- struct osd_compat_objid *map;
- struct dentry *d;
- struct ost_id *ostid = &info->oti_ostid;
- int dirn, rc = 0;
- char name[32];
+ struct osd_obj_map *map;
+ struct osd_obj_seq *osd_seq;
+ struct dentry *d;
+ struct ost_id *ostid = &info->oti_ostid;
+ int dirn, rc = 0;
+ char name[32];
ENTRY;
map = osd->od_ost_map;
LASSERT(map);
- LASSERT(map->root);
- LASSERT(map->subdir_count > 0);
- LASSERT(map->groups[ostid->oi_seq].groot);
- /* map fid to group:objid */
+ /* map fid to seq:objid */
fid_ostid_pack(fid, ostid);
- dirn = ostid->oi_id & (map->subdir_count - 1);
- d = map->groups[ostid->oi_seq].dirs[dirn];
+
+ osd_seq = osd_seq_load(osd, ostid->oi_seq);
+ if (IS_ERR(osd_seq))
+ RETURN(PTR_ERR(osd_seq));
+
+ dirn = ostid->oi_id & (osd_seq->oos_subdir_count - 1);
+ d = osd_seq->oos_dirs[dirn];
LASSERT(d);
- sprintf(name, "%llu", ostid->oi_id);
- rc = osd_compat_add_entry(info, osd, d, name, id, th);
+ osd_oid_name(name, fid, ostid->oi_id);
+ rc = osd_obj_add_entry(info, osd, d, name, id, th);
RETURN(rc);
}
-int osd_compat_objid_delete(struct osd_thread_info *info,
- struct osd_device *osd,
- const struct lu_fid *fid, struct thandle *th)
+int osd_obj_map_delete(struct osd_thread_info *info, struct osd_device *osd,
+ const struct lu_fid *fid, struct thandle *th)
{
- struct osd_compat_objid *map;
- struct dentry *d;
- struct ost_id *ostid = &info->oti_ostid;
- int dirn, rc = 0;
- char name[32];
+ struct osd_obj_map *map;
+ struct osd_obj_seq *osd_seq;
+ struct dentry *d;
+ struct ost_id *ostid = &info->oti_ostid;
+ int dirn, rc = 0;
+ char name[32];
ENTRY;
map = osd->od_ost_map;
LASSERT(map);
- LASSERT(map->root);
- LASSERT(map->subdir_count > 0);
- LASSERT(map->groups[ostid->oi_seq].groot);
- /* map fid to group:objid */
+ /* map fid to seq:objid */
fid_ostid_pack(fid, ostid);
- dirn = ostid->oi_id & (map->subdir_count - 1);
- d = map->groups[ostid->oi_seq].dirs[dirn];
- LASSERT(d);
- sprintf(name, "%llu", ostid->oi_id);
- rc = osd_compat_del_entry(info, osd, d, name, th);
+ osd_seq = osd_seq_load(osd, ostid->oi_seq);
+ if (IS_ERR(osd_seq))
+ GOTO(cleanup, rc = PTR_ERR(osd_seq));
+
+ dirn = ostid->oi_id & (osd_seq->oos_subdir_count - 1);
+ d = osd_seq->oos_dirs[dirn];
+ LASSERT(d);
+ osd_oid_name(name, fid, ostid->oi_id);
+ rc = osd_obj_del_entry(info, osd, d, name, th);
+cleanup:
RETURN(rc);
}
};
static const struct named_oid oids[] = {
- { FLD_INDEX_OID, "" /* "fld" */ },
- { FID_SEQ_CTL_OID, "" /* "seq_ctl" */ },
- { FID_SEQ_SRV_OID, "" /* "seq_srv" */ },
- { MDD_ROOT_INDEX_OID, "" /* "ROOT" */ },
- { MDD_ORPHAN_OID, "" /* "PENDING" */ },
- { MDD_LOV_OBJ_OID, "" /* LOV_OBJID */ },
- { MDD_CAPA_KEYS_OID, "" /* CAPA_KEYS */ },
+ { FLD_INDEX_OID, "fld" },
+ { FID_SEQ_CTL_OID, "seq_ctl" },
+ { FID_SEQ_SRV_OID, "seq_srv" },
+ { MDD_ROOT_INDEX_OID, "" /* "ROOT" */ },
+ { MDD_ORPHAN_OID, "" /* "PENDING" */ },
+ { MDD_LOV_OBJ_OID, LOV_OBJID },
+ { MDD_CAPA_KEYS_OID, "" /* CAPA_KEYS */ },
{ MDT_LAST_RECV_OID, LAST_RCVD },
- { OFD_LAST_RECV_OID, "" /* LAST_RCVD */ },
- { OFD_LAST_GROUP_OID, "" /* "LAST_GROUP" */ },
- { LLOG_CATALOGS_OID, "" /* "CATALOGS" */ },
- { MGS_CONFIGS_OID, "" /* MOUNT_CONFIGS_DIR */ },
- { OFD_HEALTH_CHECK_OID, "" /* HEALTH_CHECK */ },
- { 0, NULL }
+ { LFSCK_BOOKMARK_OID, "" /* "lfsck_bookmark" */ },
+ { OTABLE_IT_OID, "" /* "otable iterator" */},
+ { OFD_LAST_RECV_OID, LAST_RCVD },
+ { OFD_LAST_GROUP_OID, "LAST_GROUP" },
+ { LLOG_CATALOGS_OID, "CATALOGS" },
+ { MGS_CONFIGS_OID, "" /* MOUNT_CONFIGS_DIR */ },
+ { OFD_HEALTH_CHECK_OID, HEALTH_CHECK },
+ { MDD_LOV_OBJ_OSEQ, LOV_OBJSEQ },
+ { 0, NULL }
};
static char *oid2name(const unsigned long oid)
return NULL;
}
-int osd_compat_spec_insert(struct osd_thread_info *info,
- struct osd_device *osd, const struct lu_fid *fid,
- const struct osd_inode_id *id, struct thandle *th)
+int osd_obj_spec_insert(struct osd_thread_info *info, struct osd_device *osd,
+ const struct lu_fid *fid,
+ const struct osd_inode_id *id,
+ struct thandle *th)
{
- struct osd_compat_objid *map = osd->od_ost_map;
- struct dentry *root = osd_sb(osd)->s_root;
- char *name;
- int rc = 0;
- int seq;
- ENTRY;
-
- if (fid_oid(fid) >= OFD_GROUP0_LAST_OID &&
- fid_oid(fid) < OFD_GROUP4K_LAST_OID) {
- /* on creation of LAST_ID we create O/<group> hierarchy */
- LASSERT(map);
- seq = fid_oid(fid) - OFD_GROUP0_LAST_OID;
- LASSERT(seq < MAX_OBJID_GROUP);
- LASSERT(map->groups[seq].groot);
- } else {
- name = oid2name(fid_oid(fid));
- if (name == NULL)
- CWARN("UNKNOWN COMPAT FID "DFID"\n", PFID(fid));
- else if (name[0])
- rc = osd_compat_add_entry(info, osd, root, name, id,
- th);
- }
-
- RETURN(rc);
+ struct osd_obj_map *map = osd->od_ost_map;
+ struct dentry *root = osd_sb(osd)->s_root;
+ char *name;
+ int rc = 0;
+ ENTRY;
+
+ if (fid_is_last_id(fid)) {
+ struct osd_obj_seq *osd_seq;
+
+ /* on creation of LAST_ID we create O/<seq> hierarchy */
+ LASSERT(map);
+ osd_seq = osd_seq_load(osd, fid_seq(fid));
+ if (IS_ERR(osd_seq))
+ RETURN(PTR_ERR(osd_seq));
+ rc = osd_obj_add_entry(info, osd, osd_seq->oos_root,
+ "LAST_ID", id, th);
+ } else {
+ name = oid2name(fid_oid(fid));
+ if (name == NULL)
+ CWARN("UNKNOWN COMPAT FID "DFID"\n", PFID(fid));
+ else if (name[0])
+ rc = osd_obj_add_entry(info, osd, root, name, id, th);
+ }
+
+ RETURN(rc);
}
-int osd_compat_spec_lookup(struct osd_thread_info *info,
- struct osd_device *osd, const struct lu_fid *fid,
- struct osd_inode_id *id)
+int osd_obj_spec_lookup(struct osd_thread_info *info, struct osd_device *osd,
+ const struct lu_fid *fid, struct osd_inode_id *id)
{
- struct dentry *dentry;
- char *name;
- int rc = -ERESTART;
-
- ENTRY;
-
- name = oid2name(fid_oid(fid));
- if (name == NULL || strlen(name) == 0)
- return -ERESTART;
-
- dentry = ll_lookup_one_len(name, osd_sb(osd)->s_root, strlen(name));
- if (!IS_ERR(dentry)) {
- if (dentry->d_inode) {
- if (is_bad_inode(dentry->d_inode)) {
- rc = -EIO;
- } else {
- id->oii_ino = dentry->d_inode->i_ino;
- id->oii_gen = dentry->d_inode->i_generation;
- rc = 0;
- }
- }
- dput(dentry);
- }
-
- RETURN(rc);
+ struct dentry *root;
+ struct dentry *dentry;
+ struct inode *inode;
+ char *name;
+ int rc = -ENOENT;
+ ENTRY;
+
+ if (fid_is_last_id(fid)) {
+ struct osd_obj_seq *osd_seq;
+
+ osd_seq = osd_seq_load(osd, fid_seq(fid));
+ if (IS_ERR(osd_seq))
+ RETURN(PTR_ERR(osd_seq));
+ root = osd_seq->oos_root;
+ name = "LAST_ID";
+ } else {
+ root = osd_sb(osd)->s_root;
+ name = oid2name(fid_oid(fid));
+ if (name == NULL || strlen(name) == 0)
+ RETURN(-ENOENT);
+ }
+
+ dentry = ll_lookup_one_len(name, root, strlen(name));
+ if (!IS_ERR(dentry)) {
+ inode = dentry->d_inode;
+ if (inode) {
+ if (is_bad_inode(inode)) {
+ rc = -EIO;
+ } else {
+ osd_id_gen(id, inode->i_ino,
+ inode->i_generation);
+ rc = 0;
+ }
+ }
+ /* if dentry is accessible after osd_compat_spec_insert it
+ * will still contain NULL inode, so don't keep it in cache */
+ d_invalidate(dentry);
+ dput(dentry);
+ }
+
+ RETURN(rc);
}
-
git://git.whamcloud.com / fs / lustre-release.git / blobdiff