#include <sys/sa_impl.h>
#include <sys/txg.h>
-static char *oi_tag = "osd_mount, oi";
-
#define OSD_OI_FID_NR (1UL << 7)
#define OSD_OI_FID_NR_MAX (1UL << OSD_OI_FID_OID_BITS_MAX)
unsigned int osd_oi_count = OSD_OI_FID_NR;
struct zpl_direntry *zde = &osd_oti_get(env)->oti_zde.lzd_reg;
int rc;
- rc = -zap_lookup(o->od_objset.os, parent, name, 8, 1, (void *)zde);
+ rc = -zap_lookup(o->od_os, parent, name, 8, 1, (void *)zde);
if (rc)
return rc;
- strncpy(oi->oi_name, name, OSD_OI_NAME_SIZE - 1);
+ rc = strlcpy(oi->oi_name, name, sizeof(oi->oi_name));
+ if (rc >= sizeof(oi->oi_name))
+ return -E2BIG;
+
+ rc = 0;
oi->oi_zapid = zde->zde_dnode;
return rc;
int rc;
/* verify it doesn't already exist */
- rc = -zap_lookup(o->od_objset.os, parent, name, 8, 1, (void *)zde);
+ rc = -zap_lookup(o->od_os, parent, name, 8, 1, (void *)zde);
if (rc == 0)
return -EEXIST;
/* create fid-to-dnode index */
- tx = dmu_tx_create(o->od_objset.os);
+ tx = dmu_tx_create(o->od_os);
if (tx == NULL)
return -ENOMEM;
la->la_valid = LA_MODE | LA_UID | LA_GID;
la->la_mode = S_IFDIR | S_IRUGO | S_IWUSR | S_IXUGO;
la->la_uid = la->la_gid = 0;
- __osd_zap_create(env, &o->od_objset, &db, tx, la, parent, oi_tag, 0);
+ __osd_zap_create(env, o, &db, tx, la, parent, 0);
zde->zde_dnode = db->db_object;
zde->zde_pad = 0;
zde->zde_type = IFTODT(S_IFDIR);
- rc = -zap_add(o->od_objset.os, parent, name, 8, 1, (void *)zde, tx);
+ rc = -zap_add(o->od_os, parent, name, 8, 1, (void *)zde, tx);
dmu_tx_commit(tx);
*child = db->db_object;
- sa_buf_rele(db, oi_tag);
+ sa_buf_rele(db, osd_obj_tag);
return rc;
}
{
struct osd_seq *osd_seq;
- cfs_list_for_each_entry(osd_seq, &seq_list->osl_seq_list, os_seq_list) {
+ list_for_each_entry(osd_seq, &seq_list->osl_seq_list, os_seq_list) {
if (osd_seq->os_seq == seq)
return osd_seq;
}
if (osd_seq == NULL)
GOTO(out, rc = -ENOMEM);
- CFS_INIT_LIST_HEAD(&osd_seq->os_seq_list);
+ INIT_LIST_HEAD(&osd_seq->os_seq_list);
osd_seq->os_seq = seq;
/* Init subdir count to be 32, but each seq can have
}
write_lock(&seq_list->osl_seq_list_lock);
- cfs_list_add(&osd_seq->os_seq_list, &seq_list->osl_seq_list);
+ list_add(&osd_seq->os_seq_list, &seq_list->osl_seq_list);
write_unlock(&seq_list->osl_seq_list_lock);
out:
up(&seq_list->osl_seq_init_sem);
} else {
zapid = osd_get_name_n_idx(env, dev, fid, buf);
- rc = -zap_lookup(dev->od_objset.os, zapid, buf,
+ rc = -zap_lookup(dev->od_os, zapid, buf,
8, 1, &info->oti_zde);
if (rc)
RETURN(rc);
}
if (rc == 0)
- dmu_prefetch(dev->od_objset.os, *oid, 0, 0);
+ dmu_prefetch(dev->od_os, *oid, 0, 0);
RETURN(rc);
}
{
struct osd_seq_list *osl = &osd->od_seq_list;
- CFS_INIT_LIST_HEAD(&osl->osl_seq_list);
+ INIT_LIST_HEAD(&osl->osl_seq_list);
rwlock_init(&osl->osl_seq_list_lock);
sema_init(&osl->osl_seq_init_sem, 1);
}
struct osd_seq *osd_seq, *tmp;
write_lock(&osl->osl_seq_list_lock);
- cfs_list_for_each_entry_safe(osd_seq, tmp, &osl->osl_seq_list,
- os_seq_list) {
- cfs_list_del(&osd_seq->os_seq_list);
+ list_for_each_entry_safe(osd_seq, tmp, &osl->osl_seq_list,
+ os_seq_list) {
+ list_del(&osd_seq->os_seq_list);
OBD_FREE(osd_seq->os_compat_dirs,
sizeof(uint64_t) * osd_seq->os_subdir_count);
OBD_FREE(osd_seq, sizeof(*osd_seq));
RETURN(0);
/* lookup /ROOT */
- rc = -zap_lookup(o->od_objset.os, o->od_root, root2convert, 8,
+ rc = -zap_lookup(o->od_os, o->od_root, root2convert, 8,
sizeof(*lze) / 8, (void *)lze);
/* doesn't exist or let actual user to handle the error */
if (rc)
if (fid_seq(&lze->lzd_fid) == FID_SEQ_ROOT)
return 0;
- tx = dmu_tx_create(o->od_objset.os);
+ tx = dmu_tx_create(o->od_os);
if (tx == NULL)
return -ENOMEM;
if (rc)
GOTO(err, rc);
- rc = -zap_remove(o->od_objset.os, o->od_root, root2convert, tx);
+ rc = -zap_remove(o->od_os, o->od_root, root2convert, tx);
if (rc)
GOTO(err, rc);
/* remove from OI */
zapid = osd_get_name_n_idx(env, o, &lze->lzd_fid, buf);
- rc = -zap_remove(o->od_objset.os, zapid, buf, tx);
+ rc = -zap_remove(o->od_os, zapid, buf, tx);
if (rc)
GOTO(err, rc);
lze->lzd_fid = newfid;
- rc = -zap_add(o->od_objset.os, o->od_root, root2convert,
+ rc = -zap_add(o->od_os, o->od_root, root2convert,
8, sizeof(*lze) / 8, (void *)lze, tx);
if (rc)
GOTO(err, rc);
/* add to OI with the new fid */
zapid = osd_get_name_n_idx(env, o, &newfid, buf);
- rc = -zap_add(o->od_objset.os, zapid, buf, 8, 1, &lze->lzd_reg, tx);
+ rc = -zap_add(o->od_os, zapid, buf, 8, 1, &lze->lzd_reg, tx);
if (rc)
GOTO(err, rc);