static int __osd_object_attr_get(const struct lu_env *env, struct osd_device *o,
struct osd_object *obj, struct lu_attr *la)
{
- struct osa_attr *osa = &osd_oti_get(env)->oti_osa;
- sa_bulk_attr_t *bulk = osd_oti_get(env)->oti_attr_bulk;
- int cnt = 0;
+ struct osa_attr *osa = &osd_oti_get(env)->oti_osa;
+ sa_bulk_attr_t *bulk = osd_oti_get(env)->oti_attr_bulk;
+ struct lustre_mdt_attrs *lma;
+ struct lu_buf buf;
+ int cnt = 0;
int rc;
ENTRY;
LASSERT(obj->oo_dn != NULL);
- la->la_valid |= LA_ATIME | LA_MTIME | LA_CTIME | LA_MODE | LA_TYPE |
- LA_SIZE | LA_UID | LA_GID | LA_FLAGS | LA_NLINK;
+ la->la_valid |= LA_ATIME | LA_MTIME | LA_CTIME | LA_BTIME | LA_MODE |
+ LA_TYPE | LA_SIZE | LA_UID | LA_GID | LA_FLAGS |
+ LA_NLINK;
SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_ATIME(o), NULL, osa->atime, 16);
SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_MTIME(o), NULL, osa->mtime, 16);
SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_CTIME(o), NULL, osa->ctime, 16);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_CRTIME(o), NULL, osa->btime, 16);
SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_MODE(o), NULL, &osa->mode, 8);
SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_SIZE(o), NULL, &osa->size, 8);
SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_LINKS(o), NULL, &osa->nlink, 8);
la->la_atime = osa->atime[0];
la->la_mtime = osa->mtime[0];
la->la_ctime = osa->ctime[0];
+ la->la_btime = osa->btime[0];
la->la_mode = osa->mode;
la->la_uid = osa->uid;
la->la_gid = osa->gid;
la->la_flags = attrs_zfs2fs(osa->flags);
la->la_size = osa->size;
- /* Try to get extra flag from LMA. Right now, only LMAI_ORPHAN
- * flags is stored in LMA, and it is only for orphan directory */
- if (S_ISDIR(la->la_mode) && dt_object_exists(&obj->oo_dt)) {
- struct osd_thread_info *info = osd_oti_get(env);
- struct lustre_mdt_attrs *lma;
- struct lu_buf buf;
-
- lma = (struct lustre_mdt_attrs *)info->oti_buf;
- buf.lb_buf = lma;
- buf.lb_len = sizeof(info->oti_buf);
- rc = osd_xattr_get(env, &obj->oo_dt, &buf, XATTR_NAME_LMA);
- if (rc > 0) {
- rc = 0;
- lma->lma_incompat = le32_to_cpu(lma->lma_incompat);
- obj->oo_lma_flags =
- lma_to_lustre_flags(lma->lma_incompat);
-
- } else if (rc == -ENODATA) {
- rc = 0;
- }
+ /* Try to get extra flags from LMA */
+ lma = (struct lustre_mdt_attrs *)osd_oti_get(env)->oti_buf;
+ buf.lb_buf = lma;
+ buf.lb_len = sizeof(osd_oti_get(env)->oti_buf);
+ down_read(&obj->oo_guard);
+ rc = osd_xattr_get_lma(env, obj, &buf);
+ if (!rc) {
+ lma->lma_incompat = le32_to_cpu(lma->lma_incompat);
+ obj->oo_lma_flags =
+ lma_to_lustre_flags(lma->lma_incompat);
+ } else if (rc == -ENODATA ||
+ !(S_ISDIR(la->la_mode) &&
+ dt_object_exists(&obj->oo_dt))) {
+ rc = 0;
}
+ up_read(&obj->oo_guard);
if (S_ISCHR(la->la_mode) || S_ISBLK(la->la_mode)) {
rc = -sa_lookup(obj->oo_sa_hdl, SA_ZPL_RDEV(o), &osa->rdev, 8);
}
/* The case someone triggered the OI scrub already. */
- if (thread_is_running(&scrub->os_thread)) {
+ if (scrub->os_running) {
if (!rc) {
LASSERT(remote);
dt_object_fini(&obj->oo_dt);
/* obj doesn't contain an lu_object_header, so we don't need call_rcu */
OBD_SLAB_FREE_PTR(obj, osd_object_kmem);
- if (unlikely(h)) {
- lu_object_header_fini(h);
- OBD_FREE_PRE(h, sizeof(*h), "kfreed");
- kfree_rcu(h, loh_rcu);
- }
+ if (unlikely(h))
+ lu_object_header_free(h);
}
static int
static int osd_attr_get(const struct lu_env *env, struct dt_object *dt,
struct lu_attr *attr)
{
- struct osd_object *obj = osd_dt_obj(dt);
- uint64_t blocks;
- uint32_t blksize;
- int rc = 0;
+ struct osd_object *obj = osd_dt_obj(dt);
+ struct osd_device *osd = osd_obj2dev(obj);
+ uint64_t blocks;
+ uint32_t blksize;
+ int rc = 0;
down_read(&obj->oo_guard);
attr->la_valid |= LA_FLAGS;
attr->la_flags |= LUSTRE_ORPHAN_FL;
}
+ if (obj->oo_lma_flags & LUSTRE_ENCRYPT_FL) {
+ attr->la_valid |= LA_FLAGS;
+ attr->la_flags |= LUSTRE_ENCRYPT_FL;
+ }
read_unlock(&obj->oo_attr_lock);
if (attr->la_valid & LA_FLAGS && attr->la_flags & LUSTRE_ORPHAN_FL)
CDEBUG(D_INFO, "%s: set orphan flag on "DFID" (%llx/%x)\n",
sa_object_size(obj->oo_sa_hdl, &blksize, &blocks);
/* we do not control size of indices, so always calculate
* it from number of blocks reported by DMU */
- if (S_ISDIR(attr->la_mode))
+ if (S_ISDIR(attr->la_mode)) {
attr->la_size = 512 * blocks;
+ rc = -zap_count(osd->od_os, obj->oo_dn->dn_object,
+ &attr->la_dirent_count);
+ }
/* Block size may be not set; suggest maximal I/O transfers. */
if (blksize == 0)
blksize = osd_spa_maxblocksize(
CWARN("%s: failed to set LMA flags: rc = %d\n",
osd->od_svname, rc);
GOTO(out, rc);
+ } else {
+ obj->oo_lma_flags =
+ la->la_flags & LUSTRE_LMA_FL_MASKS;
}
}
}
sa_bulk_attr_t *bulk = osd_oti_get(env)->oti_attr_bulk;
struct osa_attr *osa = &osd_oti_get(env)->oti_osa;
uint64_t gen;
- uint64_t crtime[2];
inode_timespec_t now;
int cnt;
int rc;
gen = dmu_tx_get_txg(tx);
gethrestime(&now);
- ZFS_TIME_ENCODE(&now, crtime);
+ ZFS_TIME_ENCODE(&now, osa->btime);
osa->atime[0] = la->la_atime;
osa->ctime[0] = la->la_ctime;
SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_ATIME(osd), NULL, osa->atime, 16);
SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_MTIME(osd), NULL, osa->mtime, 16);
SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_CTIME(osd), NULL, osa->ctime, 16);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_CRTIME(osd), NULL, crtime, 16);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_CRTIME(osd), NULL, osa->btime, 16);
SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_LINKS(osd), NULL, &osa->nlink, 8);
#ifdef ZFS_PROJINHERIT
if (osd->od_projectused_dn)
/* we may fix some attributes, better do not change the source */
obj->oo_attr = *attr;
+ obj->oo_attr.la_size = 0;
+ obj->oo_attr.la_nlink = 0;
obj->oo_attr.la_valid |= LA_SIZE | LA_NLINK | LA_TYPE;
#ifdef ZFS_PROJINHERIT
__u64 start, __u64 end)
{
struct osd_device *osd = osd_obj2dev(osd_dt_obj(dt));
- struct dmu_buf_impl *db = osd_dt_obj(dt)->oo_dn->dn_dbuf;
uint64_t txg = 0;
ENTRY;
if (osd->od_dt_dev.dd_rdonly)
RETURN(0);
- mutex_enter(&db->db_mtx);
- if (db->db_last_dirty)
- txg = db->db_last_dirty->dr_txg;
- mutex_exit(&db->db_mtx);
-
+ txg = osd_db_dirty_txg(osd_dt_obj(dt)->oo_dn->dn_dbuf);
if (txg) {
/* the object is dirty or being synced */
if (osd_object_sync_delay_us < 0)
return 0;
}
+static bool osd_check_stale(struct dt_object *dt)
+{
+ return false;
+}
+
static struct dt_object_operations osd_obj_ops = {
.do_read_lock = osd_read_lock,
.do_write_lock = osd_write_lock,
.do_xattr_list = osd_xattr_list,
.do_object_sync = osd_object_sync,
.do_invalidate = osd_invalidate,
+ .do_check_stale = osd_check_stale,
};
static struct lu_object_operations osd_lu_obj_ops = {
git://git.whamcloud.com / fs / lustre-release.git / blobdiff