struct lvfs_run_ctxt *newctxt,
struct lvfs_run_ctxt *save)
{
- OBD_SET_CTXT_MAGIC(newctxt);
- newctxt->pwdmnt = dev->od_mnt;
- newctxt->pwd = dev->od_mnt->mnt_root;
- newctxt->fs = get_ds();
+ OBD_SET_CTXT_MAGIC(newctxt);
+ newctxt->pwdmnt = dev->od_mnt;
+ newctxt->pwd = dev->od_mnt->mnt_root;
+ newctxt->fs = get_ds();
- push_ctxt(save, newctxt, NULL);
-}
-
-static void osd_pop_ctxt(const struct osd_device *dev,
- struct lvfs_run_ctxt *new,
- struct lvfs_run_ctxt *save)
-{
- pop_ctxt(save, new, NULL);
+ push_ctxt(save, newctxt);
}
/* utility to make a directory */
GOTO(out_up, dchild);
}
- err = ll_vfs_mkdir(dir->d_inode, dchild, mnt, mode);
+ err = vfs_mkdir(dir->d_inode, dchild, mode);
if (err)
GOTO(out_err, err);
struct dentry *dlast;
loff_t off;
int rc = 0;
- int count = FILTER_SUBDIR_COUNT;
+ int count = OBJ_SUBDIR_COUNT;
ENTRY;
struct osd_mdobj_map *omm;
struct dentry *d;
struct osd_thread_info *info = osd_oti_get(env);
- struct lu_fid *fid = &info->oti_fid;
+ struct lu_fid *fid = &info->oti_fid3;
int rc = 0;
ENTRY;
omm = dev->od_mdt_map;
- LASSERT(dev->od_fsops);
-
parent = osd_sb(dev)->s_root;
osd_push_ctxt(dev, &new, &save);
/* Set LMA for remote parent inode */
lu_local_obj_fid(fid, REMOTE_PARENT_DIR_OID);
- rc = osd_ea_fid_set(info, d->d_inode, fid, 0);
- if (rc != 0)
- GOTO(cleanup, rc);
+ rc = osd_ea_fid_set(info, d->d_inode, fid, LMAC_NOT_IN_OI, 0);
+
+ GOTO(cleanup, rc);
+
cleanup:
- pop_ctxt(&save, &new, NULL);
+ pop_ctxt(&save, &new);
if (rc) {
if (omm->omm_remote_parent != NULL)
dput(omm->omm_remote_parent);
OBD_FREE_PTR(omm);
dev->od_mdt_map = NULL;
}
- RETURN(rc);
+ return rc;
}
static void osd_mdt_fini(struct osd_device *osd)
NULL);
CDEBUG(D_INODE, "%s: add %s:%lu to remote parent %lu.\n", osd_name(osd),
name, obj->oo_inode->i_ino, parent->d_inode->i_ino);
- LASSERTF(parent->d_inode->i_nlink > 1, "%s: %lu nlink %d",
- osd_name(osd), parent->d_inode->i_ino,
- parent->d_inode->i_nlink);
- parent->d_inode->i_nlink++;
+ ldiskfs_inc_count(oh->ot_handle, parent->d_inode);
mark_inode_dirty(parent->d_inode);
mutex_unlock(&parent->d_inode->i_mutex);
RETURN(rc);
dentry = osd_child_dentry_by_inode(env, parent->d_inode,
name, strlen(name));
mutex_lock(&parent->d_inode->i_mutex);
- bh = osd_ldiskfs_find_entry(parent->d_inode, dentry, &de, NULL);
+ bh = osd_ldiskfs_find_entry(parent->d_inode, &dentry->d_name, &de,
+ NULL, NULL);
if (bh == NULL) {
mutex_unlock(&parent->d_inode->i_mutex);
RETURN(-ENOENT);
CDEBUG(D_INODE, "%s: el %s:%lu to remote parent %lu.\n", osd_name(osd),
name, obj->oo_inode->i_ino, parent->d_inode->i_ino);
rc = ldiskfs_delete_entry(oh->ot_handle, parent->d_inode, de, bh);
- LASSERTF(parent->d_inode->i_nlink > 1, "%s: %lu nlink %d",
- osd_name(osd), parent->d_inode->i_ino,
- parent->d_inode->i_nlink);
- parent->d_inode->i_nlink--;
+ ldiskfs_dec_count(oh->ot_handle, parent->d_inode);
mark_inode_dirty(parent->d_inode);
mutex_unlock(&parent->d_inode->i_mutex);
brelse(bh);
dentry = osd_child_dentry_by_inode(oti->oti_env, parent->d_inode,
name, strlen(name));
mutex_lock(&parent->d_inode->i_mutex);
- bh = osd_ldiskfs_find_entry(parent->d_inode, dentry, &de, NULL);
+ bh = osd_ldiskfs_find_entry(parent->d_inode, &dentry->d_name, &de,
+ NULL, NULL);
if (bh == NULL) {
rc = -ENOENT;
} else {
* CONFIGS
*
*/
-static int osd_ost_init(struct osd_device *dev)
+static int osd_ost_init(const struct lu_env *env, 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;
+ struct lvfs_run_ctxt new;
+ struct lvfs_run_ctxt save;
+ struct dentry *rootd = osd_sb(dev)->s_root;
+ struct dentry *d;
+ struct osd_thread_info *info = osd_oti_get(env);
+ struct inode *inode;
+ struct lu_fid *fid = &info->oti_fid3;
+ int rc;
ENTRY;
OBD_ALLOC_PTR(dev->od_ost_map);
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);
+ d = ll_lookup_one_len("O", rootd, strlen("O"));
if (IS_ERR(d))
GOTO(cleanup, rc = PTR_ERR(d));
+ if (d->d_inode == NULL) {
+ dput(d);
+ /* The lookup() may be called again inside simple_mkdir().
+ * Since the repeated lookup() only be called for "/O" at
+ * mount time, it will not affect the whole performance. */
+ d = simple_mkdir(rootd, dev->od_mnt, "O", 0755, 1);
+ if (IS_ERR(d))
+ GOTO(cleanup, rc = PTR_ERR(d));
+
+ /* It is quite probably that the device is new formatted. */
+ dev->od_maybe_new = 1;
+ }
- ldiskfs_set_inode_state(d->d_inode, LDISKFS_STATE_LUSTRE_NO_OI);
+ inode = d->d_inode;
+ ldiskfs_set_inode_state(inode, LDISKFS_STATE_LUSTRE_NO_OI);
dev->od_ost_map->om_root = d;
+ /* 'What the @fid is' is not imporatant, because the object
+ * has no OI mapping, and only is visible inside the OSD.*/
+ lu_igif_build(fid, inode->i_ino, inode->i_generation);
+ rc = osd_ea_fid_set(info, inode, fid,
+ LMAC_NOT_IN_OI | LMAC_FID_ON_OST, 0);
+
+ GOTO(cleanup, rc);
+
cleanup:
- osd_pop_ctxt(dev, &new, &save);
+ pop_ctxt(&save, &new);
if (IS_ERR(d)) {
OBD_FREE_PTR(dev->od_ost_map);
RETURN(PTR_ERR(d));
}
-
- RETURN(rc);
+ return rc;
}
static void osd_seq_free(struct osd_obj_map *map,
ENTRY;
/* prepare structures for OST */
- rc = osd_ost_init(dev);
+ rc = osd_ost_init(env, dev);
if (rc)
RETURN(rc);
osd_mdt_fini(dev);
}
+/**
+ * Update the specified OI mapping.
+ *
+ * \retval 1, changed nothing
+ * \retval 0, changed successfully
+ * \retval -ve, on error
+ */
+static int osd_obj_update_entry(struct osd_thread_info *info,
+ struct osd_device *osd,
+ struct dentry *dir, const char *name,
+ const struct lu_fid *fid,
+ const struct osd_inode_id *id,
+ handle_t *th)
+{
+ struct inode *parent = dir->d_inode;
+ struct dentry *child;
+ struct ldiskfs_dir_entry_2 *de;
+ struct buffer_head *bh;
+ struct inode *inode;
+ struct dentry *dentry = &info->oti_obj_dentry;
+ struct osd_inode_id *oi_id = &info->oti_id3;
+ struct lustre_mdt_attrs *lma = &info->oti_mdt_attrs;
+ struct lu_fid *oi_fid = &lma->lma_self_fid;
+ int rc;
+ ENTRY;
+
+ LASSERT(th != NULL);
+ LASSERT(th->h_transaction != NULL);
+
+ child = &info->oti_child_dentry;
+ child->d_parent = dir;
+ child->d_name.hash = 0;
+ child->d_name.name = name;
+ child->d_name.len = strlen(name);
+
+ ll_vfs_dq_init(parent);
+ mutex_lock(&parent->i_mutex);
+ bh = osd_ldiskfs_find_entry(parent, &child->d_name, &de, NULL, NULL);
+ if (bh == NULL)
+ GOTO(out, rc = -ENOENT);
+
+ if (le32_to_cpu(de->inode) == id->oii_ino)
+ GOTO(out, rc = 1);
+
+ osd_id_gen(oi_id, le32_to_cpu(de->inode), OSD_OII_NOGEN);
+ inode = osd_iget(info, osd, oi_id);
+ if (IS_ERR(inode)) {
+ rc = PTR_ERR(inode);
+ if (rc == -ENOENT || rc == -ESTALE)
+ goto update;
+ GOTO(out, rc);
+ }
+
+ rc = osd_get_lma(info, inode, dentry, lma);
+ if (rc == -ENODATA) {
+ rc = osd_get_idif(info, inode, dentry, oi_fid);
+ if (rc > 0) {
+ oi_fid = NULL;
+ rc = 0;
+ }
+ }
+ iput(inode);
+
+ /* If the OST-object has neither FID-in-LMA nor FID-in-ff, it is
+ * either a crashed object or a uninitialized one. Replace it. */
+ if (rc == -ENODATA || oi_fid == NULL)
+ goto update;
+
+ if (rc != 0)
+ GOTO(out, rc);
+
+ if (lu_fid_eq(fid, oi_fid)) {
+ CERROR("%s: the FID "DFID" is used by two objects: "
+ "%u/%u %u/%u\n", osd_name(osd), PFID(fid),
+ oi_id->oii_ino, oi_id->oii_gen,
+ id->oii_ino, id->oii_gen);
+ GOTO(out, rc = -EEXIST);
+ }
+
+update:
+ /* There may be temporary inconsistency: On one hand, the new
+ * object may be referenced by multiple entries, which is out
+ * of our control unless we traverse the whole /O completely,
+ * which is non-flat order and inefficient, should be avoided;
+ * On the other hand, the old object may become orphan if it
+ * is still valid. Since it was referenced by an invalid entry,
+ * making it as invisible temporary may be not worse. OI scrub
+ * will process it later. */
+ rc = ldiskfs_journal_get_write_access(th, bh);
+ if (rc != 0)
+ GOTO(out, rc);
+
+ de->inode = cpu_to_le32(id->oii_ino);
+ rc = ldiskfs_journal_dirty_metadata(th, bh);
+
+ GOTO(out, rc);
+
+out:
+ brelse(bh);
+ mutex_unlock(&parent->i_mutex);
+ return rc;
+}
+
static int osd_obj_del_entry(struct osd_thread_info *info,
struct osd_device *osd,
struct dentry *dird, char *name,
- struct thandle *th)
+ handle_t *th)
{
struct ldiskfs_dir_entry_2 *de;
struct buffer_head *bh;
- struct osd_thandle *oh;
struct dentry *child;
struct inode *dir = dird->d_inode;
int rc;
ENTRY;
- oh = container_of(th, struct osd_thandle, ot_super);
- LASSERT(oh->ot_handle != NULL);
- LASSERT(oh->ot_handle->h_transaction != NULL);
+ LASSERT(th != NULL);
+ LASSERT(th->h_transaction != NULL);
child = &info->oti_child_dentry;
ll_vfs_dq_init(dir);
mutex_lock(&dir->i_mutex);
rc = -ENOENT;
- bh = osd_ldiskfs_find_entry(dir, child, &de, NULL);
+ bh = osd_ldiskfs_find_entry(dir, &child->d_name, &de, NULL, NULL);
if (bh) {
- rc = ldiskfs_delete_entry(oh->ot_handle, dir, de, bh);
+ rc = ldiskfs_delete_entry(th, dir, de, bh);
brelse(bh);
}
mutex_unlock(&dir->i_mutex);
struct osd_device *osd,
struct dentry *dir, char *name,
const struct osd_inode_id *id,
- struct thandle *th)
+ handle_t *th)
{
- struct osd_thandle *oh;
- struct dentry *child;
- struct inode *inode;
- int rc;
+ struct dentry *child;
+ struct inode *inode;
+ int rc;
- ENTRY;
+ ENTRY;
+
+ if (OBD_FAIL_CHECK(OBD_FAIL_OSD_COMPAT_NO_ENTRY))
+ RETURN(0);
- oh = container_of(th, struct osd_thandle, ot_super);
- LASSERT(oh->ot_handle != NULL);
- LASSERT(oh->ot_handle->h_transaction != NULL);
+ LASSERT(th != NULL);
+ LASSERT(th->h_transaction != NULL);
- inode = &info->oti_inode;
- inode->i_sb = osd_sb(osd);
+ inode = &info->oti_inode;
+ inode->i_sb = osd_sb(osd);
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_name.name = name;
- child->d_name.len = strlen(name);
- child->d_parent = dir;
- child->d_inode = inode;
+ child = &info->oti_child_dentry;
+ child->d_name.hash = 0;
+ child->d_name.name = name;
+ child->d_name.len = strlen(name);
+ child->d_parent = dir;
+ child->d_inode = inode;
+
+ if (OBD_FAIL_CHECK(OBD_FAIL_OSD_COMPAT_INVALID_ENTRY))
+ inode->i_ino++;
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);
+ rc = osd_ldiskfs_add_entry(th, child, inode, NULL);
mutex_unlock(&dir->d_inode->i_mutex);
RETURN(rc);
}
/* external locking is required */
-static int osd_seq_load_locked(struct osd_device *osd,
+static int osd_seq_load_locked(struct osd_thread_info *info,
+ struct osd_device *osd,
struct osd_obj_seq *osd_seq)
{
struct osd_obj_map *map = osd->od_ost_map;
struct dentry *seq_dir;
+ struct inode *inode;
+ struct lu_fid *fid = &info->oti_fid3;
int rc = 0;
int i;
char dir_name[32];
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);
+ inode = seq_dir->d_inode;
+ ldiskfs_set_inode_state(inode, LDISKFS_STATE_LUSTRE_NO_OI);
osd_seq->oos_root = seq_dir;
+ /* 'What the @fid is' is not imporatant, because the object
+ * has no OI mapping, and only is visible inside the OSD.*/
+ lu_igif_build(fid, inode->i_ino, inode->i_generation);
+ rc = osd_ea_fid_set(info, inode, fid,
+ LMAC_NOT_IN_OI | LMAC_FID_ON_OST, 0);
+ if (rc != 0)
+ GOTO(out_put, rc);
+
LASSERT(osd_seq->oos_dirs == NULL);
OBD_ALLOC(osd_seq->oos_dirs,
sizeof(seq_dir) * osd_seq->oos_subdir_count);
GOTO(out_free, rc = -EFAULT);
}
- ldiskfs_set_inode_state(dir->d_inode, LDISKFS_STATE_LUSTRE_NO_OI);
+ inode = dir->d_inode;
+ ldiskfs_set_inode_state(inode, LDISKFS_STATE_LUSTRE_NO_OI);
osd_seq->oos_dirs[i] = dir;
+
+ /* 'What the @fid is' is not imporatant, because the object
+ * has no OI mapping, and only is visible inside the OSD.*/
+ lu_igif_build(fid, inode->i_ino, inode->i_generation);
+ rc = osd_ea_fid_set(info, inode, fid,
+ LMAC_NOT_IN_OI | LMAC_FID_ON_OST, 0);
+ if (rc != 0)
+ GOTO(out_free, rc);
}
if (rc != 0) {
RETURN(rc);
}
-struct osd_obj_seq *osd_seq_load(struct osd_device *osd, obd_seq seq)
+static struct osd_obj_seq *osd_seq_load(struct osd_thread_info *info,
+ struct osd_device *osd, obd_seq seq)
{
struct osd_obj_map *map;
struct osd_obj_seq *osd_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);
+ rc = osd_seq_load_locked(info, osd, osd_seq);
if (rc != 0)
GOTO(cleanup, rc);
LASSERT(map->om_root);
fid_to_ostid(fid, ostid);
- osd_seq = osd_seq_load(dev, ostid_seq(ostid));
+ osd_seq = osd_seq_load(info, dev, ostid_seq(ostid));
if (IS_ERR(osd_seq))
RETURN(PTR_ERR(osd_seq));
dir = d_seq->d_inode;
mutex_lock(&dir->i_mutex);
- bh = osd_ldiskfs_find_entry(dir, child, &de, NULL);
+ bh = osd_ldiskfs_find_entry(dir, &child->d_name, &de, NULL, NULL);
mutex_unlock(&dir->i_mutex);
if (bh == NULL)
struct osd_device *osd,
const struct lu_fid *fid,
const struct osd_inode_id *id,
- struct thandle *th)
+ handle_t *th)
{
struct osd_obj_map *map;
struct osd_obj_seq *osd_seq;
struct dentry *d;
struct ost_id *ostid = &info->oti_ostid;
+ obd_id oid;
int dirn, rc = 0;
char name[32];
- ENTRY;
+ ENTRY;
- map = osd->od_ost_map;
- LASSERT(map);
+ map = osd->od_ost_map;
+ LASSERT(map);
/* map fid to seq:objid */
- fid_to_ostid(fid, ostid);
+ fid_to_ostid(fid, ostid);
- osd_seq = osd_seq_load(osd, ostid_seq(ostid));
+ oid = ostid_id(ostid);
+ osd_seq = osd_seq_load(info, osd, ostid_seq(ostid));
if (IS_ERR(osd_seq))
RETURN(PTR_ERR(osd_seq));
- dirn = ostid_id(ostid) & (osd_seq->oos_subdir_count - 1);
+ dirn = oid & (osd_seq->oos_subdir_count - 1);
d = osd_seq->oos_dirs[dirn];
- LASSERT(d);
+ LASSERT(d);
- osd_oid_name(name, sizeof(name), fid, ostid_id(ostid));
+ osd_oid_name(name, sizeof(name), fid, oid);
+
+again:
rc = osd_obj_add_entry(info, osd, d, name, id, th);
+ if (rc == -EEXIST) {
+ rc = osd_obj_update_entry(info, osd, d, name, fid, id, th);
+ if (unlikely(rc == -ENOENT))
+ goto again;
- RETURN(rc);
+ if (unlikely(rc == 1))
+ RETURN(0);
+ }
+
+ RETURN(rc);
}
int osd_obj_map_delete(struct osd_thread_info *info, struct osd_device *osd,
- const struct lu_fid *fid, struct thandle *th)
+ const struct lu_fid *fid, handle_t *th)
{
struct osd_obj_map *map;
struct osd_obj_seq *osd_seq;
/* map fid to seq:objid */
fid_to_ostid(fid, ostid);
- osd_seq = osd_seq_load(osd, ostid_seq(ostid));
+ osd_seq = osd_seq_load(info, osd, ostid_seq(ostid));
if (IS_ERR(osd_seq))
GOTO(cleanup, rc = PTR_ERR(osd_seq));
RETURN(rc);
}
-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)
+int osd_obj_map_update(struct osd_thread_info *info,
+ struct osd_device *osd,
+ const struct lu_fid *fid,
+ const struct osd_inode_id *id,
+ handle_t *th)
{
- struct osd_obj_map *map = osd->od_ost_map;
- struct dentry *root = osd_sb(osd)->s_root;
- char *name;
- int rc = 0;
+ struct osd_obj_seq *osd_seq;
+ struct dentry *d;
+ struct ost_id *ostid = &info->oti_ostid;
+ int dirn, rc = 0;
+ char name[32];
+ ENTRY;
+
+ fid_to_ostid(fid, ostid);
+ osd_seq = osd_seq_load(info, osd, ostid_seq(ostid));
+ if (IS_ERR(osd_seq))
+ RETURN(PTR_ERR(osd_seq));
+
+ dirn = ostid_id(ostid) & (osd_seq->oos_subdir_count - 1);
+ d = osd_seq->oos_dirs[dirn];
+ LASSERT(d);
+
+ osd_oid_name(name, sizeof(name), fid, ostid_id(ostid));
+ rc = osd_obj_update_entry(info, osd, d, name, fid, id, th);
+
+ RETURN(rc);
+}
+
+int osd_obj_map_recover(struct osd_thread_info *info,
+ struct osd_device *osd,
+ struct inode *src_parent,
+ struct dentry *src_child,
+ const struct lu_fid *fid)
+{
+ struct osd_obj_seq *osd_seq;
+ struct dentry *tgt_parent;
+ struct dentry *tgt_child = &info->oti_child_dentry;
+ struct inode *dir;
+ struct inode *inode = src_child->d_inode;
+ struct ost_id *ostid = &info->oti_ostid;
+ handle_t *jh;
+ struct ldiskfs_dir_entry_2 *de;
+ struct buffer_head *bh;
+ char name[32];
+ int dirn;
+ int rc = 0;
ENTRY;
if (fid_is_last_id(fid)) {
- struct osd_obj_seq *osd_seq;
+ osd_seq = osd_seq_load(info, osd, fid_seq(fid));
+ if (IS_ERR(osd_seq))
+ RETURN(PTR_ERR(osd_seq));
- /* on creation of LAST_ID we create O/<seq> hierarchy */
- LASSERT(map);
- osd_seq = osd_seq_load(osd, fid_seq(fid));
+ tgt_parent = osd_seq->oos_root;
+ tgt_child->d_name.name = "LAST_ID";
+ tgt_child->d_name.len = strlen("LAST_ID");
+ } else {
+ fid_to_ostid(fid, ostid);
+ osd_seq = osd_seq_load(info, osd, ostid_seq(ostid));
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);
+
+ dirn = ostid_id(ostid) & (osd_seq->oos_subdir_count - 1);
+ tgt_parent = osd_seq->oos_dirs[dirn];
+ osd_oid_name(name, sizeof(name), fid, ostid_id(ostid));
+ tgt_child->d_name.name = name;
+ tgt_child->d_name.len = strlen(name);
+ }
+ LASSERT(tgt_parent != NULL);
+
+ dir = tgt_parent->d_inode;
+ tgt_child->d_name.hash = 0;
+ tgt_child->d_parent = tgt_parent;
+ tgt_child->d_inode = inode;
+
+ /* The non-initialized src_child may be destroyed. */
+ jh = osd_journal_start_sb(osd_sb(osd), LDISKFS_HT_MISC,
+ osd_dto_credits_noquota[DTO_INDEX_DELETE] +
+ osd_dto_credits_noquota[DTO_INDEX_INSERT] +
+ osd_dto_credits_noquota[DTO_OBJECT_DELETE]);
+ if (IS_ERR(jh))
+ RETURN(PTR_ERR(jh));
+
+ ll_vfs_dq_init(src_parent);
+ ll_vfs_dq_init(dir);
+
+ mutex_lock(&src_parent->i_mutex);
+ mutex_lock(&dir->i_mutex);
+ bh = osd_ldiskfs_find_entry(dir, &tgt_child->d_name, &de, NULL, NULL);
+ if (bh != NULL) {
+ /* XXX: If some other object occupied the same slot. And If such
+ * inode is zero-sized and with SUID+SGID, then means it is
+ * a new created one. Maybe we can remove it and insert the
+ * original one back to the /O/<seq>/d<x>. But there are
+ * something to be considered:
+ *
+ * 1) The OST-object under /lost+found has crashed LMA.
+ * So it should not conflict with the current one.
+ *
+ * 2) There are race conditions that: someone may just want
+ * to modify the current one. Even if the OI scrub takes
+ * the object lock when remove the current one, it still
+ * cause the modification to be lost becasue the target
+ * has been removed when the RPC service thread waiting
+ * for the lock.
+ *
+ * So keep it there before we have suitable solution. */
+ brelse(bh);
+ mutex_unlock(&dir->i_mutex);
+ mutex_unlock(&src_parent->i_mutex);
+ ldiskfs_journal_stop(jh);
+
+ rc = -EEXIST;
+ /* If the src object has never been modified, then remove it. */
+ if (inode->i_size == 0 && inode->i_mode & S_ISUID &&
+ inode->i_mode & S_ISGID) {
+ rc = vfs_unlink(src_parent, src_child);
+ if (unlikely(rc == -ENOENT))
+ rc = 0;
+ }
+ RETURN(rc);
+ }
+
+ bh = osd_ldiskfs_find_entry(src_parent, &src_child->d_name, &de,
+ NULL, NULL);
+ if (unlikely(bh == NULL))
+ GOTO(unlock, rc = -ENOENT);
+
+ rc = ldiskfs_delete_entry(jh, src_parent, de, bh);
+ brelse(bh);
+ if (rc != 0)
+ GOTO(unlock, rc);
+
+ rc = osd_ldiskfs_add_entry(jh, tgt_child, inode, NULL);
+
+ GOTO(unlock, rc);
+
+unlock:
+ mutex_unlock(&dir->i_mutex);
+ mutex_unlock(&src_parent->i_mutex);
+ ldiskfs_journal_stop(jh);
+ return rc;
+}
+
+static struct dentry *
+osd_object_spec_find(struct osd_thread_info *info, struct osd_device *osd,
+ const struct lu_fid *fid, char **name)
+{
+ struct dentry *root = ERR_PTR(-ENOENT);
+
+ if (fid_is_last_id(fid)) {
+ struct osd_obj_seq *osd_seq;
+
+ /* on creation of LAST_ID we create O/<seq> hierarchy */
+ osd_seq = osd_seq_load(info, osd, fid_seq(fid));
+ if (IS_ERR(osd_seq))
+ RETURN((struct dentry *)osd_seq);
+
+ *name = "LAST_ID";
+ root = osd_seq->oos_root;
} else {
- name = osd_lf_fid2name(fid);
- if (name == NULL)
+ *name = osd_lf_fid2name(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);
+ else if ((*name)[0])
+ root = osd_sb(osd)->s_root;
+ }
+
+ return root;
+}
+
+int osd_obj_spec_update(struct osd_thread_info *info, struct osd_device *osd,
+ const struct lu_fid *fid, const struct osd_inode_id *id,
+ handle_t *th)
+{
+ struct dentry *root;
+ char *name;
+ int rc;
+ ENTRY;
+
+ root = osd_object_spec_find(info, osd, fid, &name);
+ if (!IS_ERR(root)) {
+ rc = osd_obj_update_entry(info, osd, root, name, fid, id, th);
+ } else {
+ rc = PTR_ERR(root);
+ if (rc == -ENOENT)
+ rc = 1;
+ }
+
+ RETURN(rc);
+}
+
+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,
+ handle_t *th)
+{
+ struct dentry *root;
+ char *name;
+ int rc;
+ ENTRY;
+
+ root = osd_object_spec_find(info, osd, fid, &name);
+ if (!IS_ERR(root)) {
+ rc = osd_obj_add_entry(info, osd, root, name, id, th);
+ } else {
+ rc = PTR_ERR(root);
+ if (rc == -ENOENT)
+ rc = 0;
}
RETURN(rc);
if (fid_is_last_id(fid)) {
struct osd_obj_seq *osd_seq;
- osd_seq = osd_seq_load(osd, fid_seq(fid));
+ osd_seq = osd_seq_load(info, osd, fid_seq(fid));
if (IS_ERR(osd_seq))
RETURN(PTR_ERR(osd_seq));
root = osd_seq->oos_root;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff