*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
};
static const struct named_oid oids[] = {
- { LAST_RECV_OID, LAST_RCVD },
- { OFD_LAST_GROUP_OID, "LAST_GROUP" },
- { LLOG_CATALOGS_OID, "CATALOGS" },
- { MGS_CONFIGS_OID, NULL /*MOUNT_CONFIGS_DIR*/ },
- { FID_SEQ_SRV_OID, "seq_srv" },
- { FID_SEQ_CTL_OID, "seq_ctl" },
- { FLD_INDEX_OID, "fld" },
- { MDD_LOV_OBJ_OID, LOV_OBJID },
- { OFD_HEALTH_CHECK_OID, HEALTH_CHECK },
- { ACCT_USER_OID, "acct_usr_inode" },
- { ACCT_GROUP_OID, "acct_grp_inode" },
- { 0, NULL }
+ { .oid = LAST_RECV_OID, .name = LAST_RCVD },
+ { .oid = OFD_LAST_GROUP_OID, .name = "LAST_GROUP" },
+ { .oid = LLOG_CATALOGS_OID, .name = "CATALOGS" },
+ { .oid = MGS_CONFIGS_OID, /*MOUNT_CONFIGS_DIR*/ },
+ { .oid = FID_SEQ_SRV_OID, .name = "seq_srv" },
+ { .oid = FID_SEQ_CTL_OID, .name = "seq_ctl" },
+ { .oid = FLD_INDEX_OID, .name = "fld" },
+ { .oid = MDD_LOV_OBJ_OID, .name = LOV_OBJID },
+ { .oid = OFD_HEALTH_CHECK_OID, .name = HEALTH_CHECK },
+ { .oid = ACCT_USER_OID, .name = "acct_usr_inode" },
+ { .oid = ACCT_GROUP_OID, .name = "acct_grp_inode" },
+ { .oid = REPLY_DATA_OID, .name = REPLY_DATA },
+ { .oid = 0 }
};
static char *oid2name(const unsigned long oid)
if (rc >= sizeof(oi->oi_name))
return -E2BIG;
- rc = 0;
oi->oi_zapid = zde->zde_dnode;
- return rc;
+ return 0;
}
/**
{
struct zpl_direntry *zde = &osd_oti_get(env)->oti_zde.lzd_reg;
struct lu_attr *la = &osd_oti_get(env)->oti_la;
- dmu_buf_t *db;
+ sa_handle_t *sa_hdl = NULL;
dmu_tx_t *tx;
+ uint64_t oid;
int rc;
/* verify it doesn't already exist */
return rc;
}
+ oid = zap_create_flags(o->od_os, 0, ZAP_FLAG_HASH64,
+ DMU_OT_DIRECTORY_CONTENTS,
+ 14, /* == ZFS fzap_default_block_shift */
+ DN_MAX_INDBLKSHIFT, /* indirect block shift */
+ DMU_OT_SA, DN_MAX_BONUSLEN, tx);
+
+ rc = -sa_handle_get(o->od_os, oid, NULL, SA_HDL_PRIVATE, &sa_hdl);
+ if (rc)
+ goto commit;
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, &db, tx, la, parent, 0);
+ rc = __osd_attr_init(env, o, sa_hdl, tx, la, parent);
+ sa_handle_destroy(sa_hdl);
+ if (rc)
+ goto commit;
- zde->zde_dnode = db->db_object;
+ zde->zde_dnode = oid;
zde->zde_pad = 0;
zde->zde_type = IFTODT(S_IFDIR);
rc = -zap_add(o->od_os, parent, name, 8, 1, (void *)zde, tx);
+commit:
+ if (rc)
+ dmu_object_free(o->od_os, oid, tx);
dmu_tx_commit(tx);
- *child = db->db_object;
- sa_buf_rele(db, osd_obj_tag);
+ if (rc == 0)
+ *child = oid;
return rc;
}
oi.oi_zapid = osd->od_O_id;
sprintf(seq_name, (fid_seq_is_rsvd(seq) ||
- fid_seq_is_mdt0(seq)) ? LPU64 : LPX64i,
+ fid_seq_is_mdt0(seq)) ? "%llu" : "%llx",
fid_seq_is_idif(seq) ? 0 : seq);
rc = osd_oi_find_or_create(env, osd, oi.oi_zapid, seq_name, &odb);
*/
static uint64_t
osd_get_idx_for_ost_obj(const struct lu_env *env, struct osd_device *osd,
- const struct lu_fid *fid, char *buf)
+ const struct lu_fid *fid, char *buf, int bufsize)
{
struct osd_seq *osd_seq;
unsigned long b;
b = id % OSD_OST_MAP_SIZE;
LASSERT(osd_seq->os_compat_dirs[b]);
- sprintf(buf, LPU64, id);
+ if (buf)
+ snprintf(buf, bufsize, "%llu", id);
return osd_seq->os_compat_dirs[b];
}
LASSERT(osd->od_oi_table != NULL);
oi = osd->od_oi_table[fid_seq(fid) & (osd->od_oi_count - 1)];
- osd_fid2str(buf, fid);
+ if (buf)
+ osd_fid2str(buf, fid);
return oi->oi_zapid;
}
uint64_t osd_get_name_n_idx(const struct lu_env *env, struct osd_device *osd,
- const struct lu_fid *fid, char *buf)
+ const struct lu_fid *fid, char *buf, int bufsize)
{
uint64_t zapid;
LASSERT(fid);
- LASSERT(buf);
if (fid_is_on_ost(env, osd, fid) == 1 || fid_seq(fid) == FID_SEQ_ECHO) {
- zapid = osd_get_idx_for_ost_obj(env, osd, fid, buf);
+ zapid = osd_get_idx_for_ost_obj(env, osd, fid, buf, bufsize);
} else if (unlikely(fid_seq(fid) == FID_SEQ_LOCAL_FILE)) {
/* special objects with fixed known fids get their name */
char *name = oid2name(fid_oid(fid));
if (name) {
zapid = osd->od_root;
- strcpy(buf, name);
+ if (buf)
+ strncpy(buf, name, bufsize);
if (fid_is_acct(fid))
zapid = MASTER_NODE_OBJ;
} else {
int rc = 0;
ENTRY;
- if (OBD_FAIL_CHECK(OBD_FAIL_OST_ENOENT))
+ if (OBD_FAIL_CHECK(OBD_FAIL_SRV_ENOENT))
RETURN(-ENOENT);
if (unlikely(fid_is_acct(fid))) {
} else if (unlikely(fid_is_fs_root(fid))) {
*oid = dev->od_root;
} else {
- zapid = osd_get_name_n_idx(env, dev, fid, buf);
-
+ zapid = osd_get_name_n_idx(env, dev, fid, buf,
+ sizeof(info->oti_buf));
rc = -zap_lookup(dev->od_os, zapid, buf,
8, 1, &info->oti_zde);
if (rc)
}
if (rc == 0)
- dmu_prefetch(dev->od_os, *oid, 0, 0);
+ osd_dmu_prefetch(dev->od_os, *oid, 0, 0, 0,
+ ZIO_PRIORITY_ASYNC_READ);
RETURN(rc);
}
oi = o->od_oi_table[key];
if (oi) {
+ if (oi->oi_db)
+ sa_buf_rele(oi->oi_db, osd_obj_tag);
OBD_FREE_PTR(oi);
o->od_oi_table[key] = NULL;
}
}
o->od_oi_table[key] = oi;
+ __osd_obj2dbuf(env, o->od_os, oi->oi_zapid, &oi->oi_db);
return 0;
}
RETURN(0);
}
-static void osd_ost_seq_init(const struct lu_env *env, struct osd_device *osd)
-{
- struct osd_seq_list *osl = &osd->od_seq_list;
-
- INIT_LIST_HEAD(&osl->osl_seq_list);
- rwlock_init(&osl->osl_seq_list_lock);
- sema_init(&osl->osl_seq_init_sem, 1);
-}
-
static void osd_ost_seq_fini(const struct lu_env *env, struct osd_device *osd)
{
struct osd_seq_list *osl = &osd->od_seq_list;
o->od_O_id = sdb;
- osd_ost_seq_init(env, o);
/* Create on-disk indexes to maintain per-UID/GID inode usage.
* Those new indexes are created in the top-level ZAP outside the
* namespace in order not to confuse ZPL which might interpret those
RETURN(rc);
}
-static char *root2convert = "ROOT";
-/*
- * due to DNE requirements we have to change sequence of /ROOT object
- * so that it doesn't belong to the local sequence FID_SEQ_LOCAL_FILE
- * but a normal sequence living on MDS#0
- * this is the sole purpose of this function.
- *
- * This is only needed for pre-production 2.4 ZFS filesystems, and
- * can be removed in the future.
- */
-int osd_convert_root_to_new_seq(const struct lu_env *env,
- struct osd_device *o)
-{
- struct luz_direntry *lze = &osd_oti_get(env)->oti_zde;
- char *buf = osd_oti_get(env)->oti_str;
- struct lu_fid newfid;
- uint64_t zapid;
- dmu_tx_t *tx = NULL;
- int rc;
- ENTRY;
-
- /* ignore OSTs */
- if (strstr(o->od_svname, "MDT") == NULL)
- RETURN(0);
-
- /* lookup /ROOT */
- 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)
- RETURN(0);
-
- CDEBUG(D_OTHER, "%s: /ROOT -> "DFID" -> "LPU64"\n", o->od_svname,
- PFID(&lze->lzd_fid), (long long int) lze->lzd_reg.zde_dnode);
-
- /* already right one? */
- if (fid_seq(&lze->lzd_fid) == FID_SEQ_ROOT)
- return 0;
-
- tx = dmu_tx_create(o->od_os);
- if (tx == NULL)
- return -ENOMEM;
-
- dmu_tx_hold_bonus(tx, o->od_root);
-
- /* declare delete/insert of the name */
- dmu_tx_hold_zap(tx, o->od_root, TRUE, root2convert);
- dmu_tx_hold_zap(tx, o->od_root, FALSE, root2convert);
-
- /* declare that we'll remove object from fid-dnode mapping */
- zapid = osd_get_name_n_idx(env, o, &lze->lzd_fid, buf);
- dmu_tx_hold_bonus(tx, zapid);
- dmu_tx_hold_zap(tx, zapid, FALSE, buf);
-
- /* declare that we'll add object to fid-dnode mapping */
- newfid.f_seq = FID_SEQ_ROOT;
- newfid.f_oid = 1;
- newfid.f_ver = 0;
- zapid = osd_get_name_n_idx(env, o, &newfid, buf);
- dmu_tx_hold_bonus(tx, zapid);
- dmu_tx_hold_zap(tx, zapid, TRUE, buf);
-
- rc = -dmu_tx_assign(tx, TXG_WAIT);
- if (rc)
- GOTO(err, rc);
-
- 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_os, zapid, buf, tx);
- if (rc)
- GOTO(err, rc);
-
- lze->lzd_fid = newfid;
- 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_os, zapid, buf, 8, 1, &lze->lzd_reg, tx);
- if (rc)
- GOTO(err, rc);
-
-
- /* LMA will be updated in mdd_compat_fixes */
- dmu_tx_commit(tx);
-
- RETURN(rc);
-
-err:
- if (tx)
- dmu_tx_abort(tx);
- CERROR("%s: can't convert to new fid: rc = %d\n", o->od_svname, rc);
- RETURN(rc);
-}
-
/**
* Initialize the OIs by either opening or creating them as needed.
*/
git://git.whamcloud.com / fs / lustre-release.git / blobdiff