* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
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();
-
- 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);
+ OBD_SET_CTXT_MAGIC(newctxt);
+ newctxt->pwdmnt = dev->od_mnt;
+ newctxt->pwd = dev->od_mnt->mnt_root;
+ newctxt->fs = get_ds();
+ newctxt->umask = current_umask();
+ newctxt->dt = NULL;
+
+ push_ctxt(save, newctxt);
}
/* utility to make a directory */
return dchild;
}
-int osd_last_rcvd_subdir_count(struct osd_device *osd)
+static int osd_last_rcvd_subdir_count(struct osd_device *osd)
{
struct lr_server_data lsd;
struct dentry *dlast;
loff_t off;
int rc = 0;
- int count = FILTER_SUBDIR_COUNT;
+ int count = OBJ_SUBDIR_COUNT;
ENTRY;
omm = dev->od_mdt_map;
- LASSERT(dev->od_fsops);
-
parent = osd_sb(dev)->s_root;
osd_push_ctxt(dev, &new, &save);
if (IS_ERR(d))
GOTO(cleanup, rc = PTR_ERR(d));
- ldiskfs_set_inode_state(d->d_inode, LDISKFS_STATE_LUSTRE_NO_OI);
omm->omm_remote_parent = d;
/* Set LMA for remote parent inode */
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);
struct osd_thread_info *oti = osd_oti_get(env);
struct lustre_mdt_attrs *lma = &oti->oti_mdt_attrs;
char *name = oti->oti_name;
+ struct osd_thread_info *info = osd_oti_get(env);
struct dentry *dentry;
struct dentry *parent;
int rc;
dentry = osd_child_dentry_by_inode(env, parent->d_inode,
name, strlen(name));
mutex_lock(&parent->d_inode->i_mutex);
- rc = osd_ldiskfs_add_entry(oh->ot_handle, dentry, obj->oo_inode,
- NULL);
+ rc = osd_ldiskfs_add_entry(info, oh->ot_handle, dentry,
+ obj->oo_inode, 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);
- if (bh == NULL) {
+ bh = osd_ldiskfs_find_entry(parent->d_inode, &dentry->d_name, &de,
+ NULL, NULL);
+ if (IS_ERR(bh)) {
mutex_unlock(&parent->d_inode->i_mutex);
- RETURN(-ENOENT);
+ RETURN(PTR_ERR(bh));
}
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);
- if (bh == NULL) {
- rc = -ENOENT;
+ bh = osd_ldiskfs_find_entry(parent->d_inode, &dentry->d_name, &de,
+ NULL, NULL);
+ if (IS_ERR(bh)) {
+ rc = PTR_ERR(bh);
} else {
- rc = 0;
+ struct inode *inode;
+
osd_id_gen(id, le32_to_cpu(de->inode), OSD_OII_NOGEN);
brelse(bh);
+ inode = osd_iget(oti, osd, id);
+ if (IS_ERR(inode)) {
+ rc = PTR_ERR(inode);
+ if (rc == -ESTALE)
+ rc = -ENOENT;
+ } else {
+ iput(inode);
+ rc = 0;
+ }
}
mutex_unlock(&parent->d_inode->i_mutex);
if (rc == 0)
/* 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);
- }
+ if (rc < 0)
+ GOTO(cleanup_alloc, rc);
dev->od_ost_map->om_subdir_count = rc;
rc = 0;
- CFS_INIT_LIST_HEAD(&dev->od_ost_map->om_seq_list);
+ 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);
+ mutex_init(&dev->od_ost_map->om_dir_init_mutex);
- LASSERT(dev->od_fsops);
osd_push_ctxt(dev, &new, &save);
d = ll_lookup_one_len("O", rootd, strlen("O"));
if (IS_ERR(d))
- GOTO(cleanup, rc = PTR_ERR(d));
+ GOTO(cleanup_ctxt, rc = PTR_ERR(d));
if (d->d_inode == NULL) {
dput(d);
/* The lookup() may be called again inside simple_mkdir().
* 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));
+ GOTO(cleanup_ctxt, rc = PTR_ERR(d));
/* It is quite probably that the device is new formatted. */
dev->od_maybe_new = 1;
}
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);
+ LMAC_NOT_IN_OI | LMAC_FID_ON_OST, 0);
+ if (rc)
+ GOTO(cleanup_dentry, rc);
- GOTO(cleanup, rc);
+ pop_ctxt(&save, &new);
+ RETURN(0);
-cleanup:
- osd_pop_ctxt(dev, &new, &save);
- if (IS_ERR(d)) {
- OBD_FREE_PTR(dev->od_ost_map);
- RETURN(PTR_ERR(d));
- }
+cleanup_dentry:
+ dput(d);
+cleanup_ctxt:
+ pop_ctxt(&save, &new);
+cleanup_alloc:
+ OBD_FREE_PTR(dev->od_ost_map);
return rc;
}
-static void osd_seq_free(struct osd_obj_map *map,
- struct osd_obj_seq *osd_seq)
+static void osd_seq_free(struct osd_obj_seq *osd_seq)
{
int j;
- 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])
return;
write_lock(&map->om_seq_list_lock);
- cfs_list_for_each_entry_safe(osd_seq, tmp,
- &map->om_seq_list,
- oos_seq_list) {
- osd_seq_free(map, osd_seq);
+ list_for_each_entry_safe(osd_seq, tmp, &map->om_seq_list,
+ oos_seq_list) {
+ list_del_init(&osd_seq->oos_seq_list);
+ write_unlock(&map->om_seq_list_lock);
+ osd_seq_free(osd_seq);
+ write_lock(&map->om_seq_list_lock);
}
write_unlock(&map->om_seq_list_lock);
if (map->om_root)
/* prepare structures for MDS */
rc = osd_mdt_init(env, dev);
+ if (rc)
+ osd_ost_fini(dev);
RETURN(rc);
}
-struct osd_obj_seq *osd_seq_find_locked(struct osd_obj_map *map, obd_seq seq)
+static struct osd_obj_seq *osd_seq_find_locked(struct osd_obj_map *map, u64 seq)
{
struct osd_obj_seq *osd_seq;
- cfs_list_for_each_entry(osd_seq, &map->om_seq_list, oos_seq_list) {
+ 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)
+static struct osd_obj_seq *osd_seq_find(struct osd_obj_map *map, u64 seq)
{
struct osd_obj_seq *osd_seq;
struct dentry *dir, const char *name,
const struct lu_fid *fid,
const struct osd_inode_id *id,
- struct thandle *th)
+ handle_t *th)
{
struct inode *parent = dir->d_inode;
- struct osd_thandle *oh;
struct dentry *child;
struct ldiskfs_dir_entry_2 *de;
struct buffer_head *bh;
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;
child->d_parent = dir;
ll_vfs_dq_init(parent);
mutex_lock(&parent->i_mutex);
- bh = osd_ldiskfs_find_entry(parent, child, &de, NULL);
- if (bh == NULL)
- GOTO(out, rc = -ENOENT);
+ bh = osd_ldiskfs_find_entry(parent, &child->d_name, &de, NULL, NULL);
+ if (IS_ERR(bh))
+ GOTO(out, rc = PTR_ERR(bh));
if (le32_to_cpu(de->inode) == id->oii_ino)
GOTO(out, rc = 1);
GOTO(out, rc);
}
+ /* The EA inode should NOT be in OI, old OI scrub may added
+ * such OI mapping by wrong, replace it. */
+ if (unlikely(osd_is_ea_inode(inode))) {
+ iput(inode);
+ goto update;
+ }
+
rc = osd_get_lma(info, inode, dentry, lma);
if (rc == -ENODATA) {
rc = osd_get_idif(info, inode, dentry, oi_fid);
- if (rc > 0) {
+ if (rc > 0 || rc == -ENODATA) {
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)) {
+ /* 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 (oi_fid != NULL && 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,
GOTO(out, rc = -EEXIST);
}
+ if (fid_is_idif(fid) && oi_fid != NULL && fid_is_idif(oi_fid)) {
+ __u32 idx1 = fid_idif_ost_idx(fid);
+ __u32 idx2 = fid_idif_ost_idx(oi_fid);
+ struct ost_id *ostid = &info->oti_ostid;
+ struct lu_fid *tfid = &info->oti_fid3;
+
+ LASSERTF(idx1 == 0 || idx1 == osd->od_index,
+ "invalid given FID "DFID", not match the "
+ "device index %u\n", PFID(fid), osd->od_index);
+
+ if (idx1 != idx2) {
+ if (idx1 == 0 && idx2 == osd->od_index) {
+ fid_to_ostid(fid, ostid);
+ ostid_to_fid(tfid, ostid, idx2);
+ if (lu_fid_eq(tfid, oi_fid)) {
+ CERROR("%s: the FID "DFID" is used by "
+ "two objects(2): %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);
+ }
+ } else if (idx2 == 0 && idx1 == osd->od_index) {
+ fid_to_ostid(oi_fid, ostid);
+ ostid_to_fid(tfid, ostid, idx1);
+ if (lu_fid_eq(tfid, fid)) {
+ CERROR("%s: the FID "DFID" is used by "
+ "two objects(2): %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
* 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(oh->ot_handle, bh);
+ 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(oh->ot_handle, bh);
+ rc = ldiskfs_handle_dirty_metadata(th, NULL, bh);
GOTO(out, rc);
out:
- brelse(bh);
+ if (!IS_ERR(bh))
+ 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);
- if (bh) {
- rc = ldiskfs_delete_entry(oh->ot_handle, dir, de, bh);
+ bh = osd_ldiskfs_find_entry(dir, &child->d_name, &de, NULL, NULL);
+ if (IS_ERR(bh)) {
+ rc = PTR_ERR(bh);
+ } else {
+ rc = ldiskfs_delete_entry(th, dir, de, bh);
brelse(bh);
}
mutex_unlock(&dir->i_mutex);
RETURN(rc);
}
-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)
+static 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,
+ handle_t *th)
{
- struct osd_thandle *oh;
struct dentry *child;
struct inode *inode;
int rc;
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;
+ if (unlikely(inode == NULL)) {
+ struct ldiskfs_inode_info *lii;
+ OBD_ALLOC_PTR(lii);
+ if (lii == NULL)
+ RETURN(-ENOMEM);
+ inode = info->oti_inode = &lii->vfs_inode;
+ }
- 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 */
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(info, th, child, inode, NULL);
mutex_unlock(&dir->d_inode->i_mutex);
RETURN(rc);
* 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, size_t name_size, obd_seq seq)
+static inline void osd_seq_name(char *seq_name, size_t name_size, u64 seq)
{
snprintf(seq_name, name_size,
(fid_seq_is_rsvd(seq) ||
}
static inline void osd_oid_name(char *name, size_t name_size,
- const struct lu_fid *fid, obd_id id)
+ const struct lu_fid *fid, u64 id)
{
snprintf(name, name_size,
(fid_seq_is_rsvd(fid_seq(fid)) ||
GOTO(out_put, rc = -EFAULT);
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
}
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
}
static struct osd_obj_seq *osd_seq_load(struct osd_thread_info *info,
- struct osd_device *osd, obd_seq seq)
+ struct osd_device *osd, u64 seq)
{
struct osd_obj_map *map;
struct osd_obj_seq *osd_seq;
RETURN(osd_seq);
/* Serializing init process */
- down(&map->om_dir_init_sem);
+ mutex_lock(&map->om_dir_init_mutex);
/* Check whether the seq has been added */
read_lock(&map->om_seq_list_lock);
if (osd_seq == NULL)
GOTO(cleanup, rc = -ENOMEM);
- CFS_INIT_LIST_HEAD(&osd_seq->oos_seq_list);
+ 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 */
GOTO(cleanup, rc);
write_lock(&map->om_seq_list_lock);
- cfs_list_add(&osd_seq->oos_seq_list, &map->om_seq_list);
+ 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);
+ mutex_unlock(&map->om_dir_init_mutex);
if (rc != 0) {
if (osd_seq != NULL)
OBD_FREE_PTR(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)
- RETURN(-ENOENT);
+ if (IS_ERR(bh))
+ RETURN(PTR_ERR(bh));
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));
+ if (IS_ERR(inode)) {
+ int rc = PTR_ERR(inode);
+
+ RETURN(rc == -ENOENT ? -ESTALE : rc);
+ }
iput(inode);
RETURN(0);
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;
+ u64 oid;
int dirn, rc = 0;
char name[32];
ENTRY;
}
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;
struct osd_device *osd,
const struct lu_fid *fid,
const struct osd_inode_id *id,
- struct thandle *th)
+ handle_t *th)
{
struct osd_obj_seq *osd_seq;
struct dentry *d;
tgt_child->d_inode = inode;
/* The non-initialized src_child may be destroyed. */
- jh = ldiskfs_journal_start_sb(osd_sb(osd),
+ 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]);
mutex_lock(&src_parent->i_mutex);
mutex_lock(&dir->i_mutex);
- bh = osd_ldiskfs_find_entry(dir, tgt_child, &de, NULL);
- if (bh != NULL) {
+ bh = osd_ldiskfs_find_entry(dir, &tgt_child->d_name, &de, NULL, NULL);
+ if (!IS_ERR(bh)) {
/* 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
* 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) {
- bh = osd_ldiskfs_find_entry(src_parent, src_child, &de,
- NULL);
- if (unlikely(bh == NULL)) {
- mutex_unlock(&src_parent->i_mutex);
- ldiskfs_journal_stop(jh);
- RETURN(0);
- }
-
- rc = ldiskfs_delete_entry(jh, src_parent, de, bh);
- brelse(bh);
- if (rc == 0) {
- drop_nlink(inode);
- ll_dirty_inode(inode, I_DIRTY_DATASYNC);
- }
+ rc = ll_vfs_unlink(src_parent, src_child);
+ if (unlikely(rc == -ENOENT))
+ rc = 0;
}
- mutex_unlock(&src_parent->i_mutex);
- ldiskfs_journal_stop(jh);
RETURN(rc);
}
- bh = osd_ldiskfs_find_entry(src_parent, src_child, &de, NULL);
- if (unlikely(bh == NULL))
- GOTO(unlock, rc = -ENOENT);
+ bh = osd_ldiskfs_find_entry(src_parent, &src_child->d_name, &de,
+ NULL, NULL);
+ if (unlikely(IS_ERR(bh)))
+ GOTO(unlock, rc = PTR_ERR(bh));
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);
+ rc = osd_ldiskfs_add_entry(info, jh, tgt_child, inode, NULL);
GOTO(unlock, rc);
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,
- struct thandle *th)
+ handle_t *th)
{
struct dentry *root;
- char *name;
+ char *name = NULL;
int rc;
ENTRY;
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)
+ handle_t *th)
{
struct dentry *root;
- char *name;
+ char *name = NULL;
int rc;
ENTRY;
struct dentry *root;
struct dentry *dentry;
struct inode *inode;
- char *name;
+ char *name = NULL;
int rc = -ENOENT;
ENTRY;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff