* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
/* Slab to allocate dynlocks */
struct kmem_cache *dynlock_cachep;
+/* Slab to allocate osd_it_ea */
+struct kmem_cache *osd_itea_cachep;
+
static struct lu_kmem_descr ldiskfs_caches[] = {
{
.ckd_cache = &dynlock_cachep,
.ckd_size = sizeof(struct dynlock_handle)
},
{
+ .ckd_cache = &osd_itea_cachep,
+ .ckd_name = "osd_itea_cache",
+ .ckd_size = sizeof(struct osd_it_ea)
+ },
+ {
.ckd_cache = NULL
}
};
check_oi:
if (rc != 0) {
+ struct osd_inode_id saved_id = *id;
+
LASSERTF(rc == -ESTALE || rc == -ENOENT, "rc = %d\n", rc);
rc = osd_oi_lookup(info, dev, fid, id, OI_CHECK_FLD);
* to distinguish the 1st case from the 2nd case. */
if (rc == 0) {
if (!IS_ERR(inode) && inode->i_generation != 0 &&
- inode->i_generation == id->oii_gen)
+ inode->i_generation == id->oii_gen) {
rc = -ENOENT;
- else
+ } else {
+ __u32 level = D_LFSCK;
+
rc = -EREMCHG;
+ if (!thread_is_running(&dev->od_scrub.os_thread))
+ level |= D_CONSOLE;
+
+ CDEBUG(level, "%s: the OI mapping for the FID "
+ DFID" become inconsistent, the given ID "
+ "%u/%u, the ID in OI mapping %u/%u\n",
+ osd_name(dev), PFID(fid),
+ saved_id.oii_ino, saved_id.oii_gen,
+ id->oii_ino, id->oii_ino);
+ }
}
} else {
if (id->oii_gen == OSD_OII_NOGEN)
if (rc == -ENODATA && !fid_is_igif(rfid) && osd->od_check_ff) {
fid = &lma->lma_self_fid;
rc = osd_get_idif(info, inode, dentry, fid);
- if ((rc > 0) || (rc == -ENODATA && osd->od_lma_self_repair)) {
+ if ((rc > 0) || (rc == -ENODATA && osd->od_index_in_idif)) {
/* For the given OST-object, if it has neither LMA nor
* FID in XATTR_NAME_FID, then the given FID (which is
* contained in the @obj, from client RPC for locating
* the OST-object) is trusted. We use it to generate
* the LMA. */
osd_lma_self_repair(info, osd, inode, rfid,
- fid_is_on_ost(info, osd, fid, OI_CHECK_FLD) ?
- LMAC_FID_ON_OST : 0);
+ LMAC_FID_ON_OST);
RETURN(0);
}
}
}
if (fid != NULL && unlikely(!lu_fid_eq(rfid, fid))) {
+ __u32 level = D_LFSCK;
+
if (fid_is_idif(rfid) && fid_is_idif(fid)) {
struct ost_id *oi = &info->oti_ostid;
struct lu_fid *fid1 = &info->oti_fid3;
fid_to_ostid(fid, oi);
ostid_to_fid(fid1, oi, idx);
if (lu_fid_eq(fid1, rfid)) {
- if (osd->od_lma_self_repair)
+ if (osd->od_index_in_idif)
osd_lma_self_repair(info, osd,
inode, rfid,
LMAC_FID_ON_OST);
}
}
- CDEBUG(D_INODE, "%s: FID "DFID" != self_fid "DFID"\n",
- osd_name(osd), PFID(rfid), PFID(fid));
+
rc = -EREMCHG;
+ if (!thread_is_running(&osd->od_scrub.os_thread))
+ level |= D_CONSOLE;
+
+ CDEBUG(level, "%s: FID "DFID" != self_fid "DFID"\n",
+ osd_name(osd), PFID(rfid), PFID(fid));
}
RETURN(rc);
if (thread_is_running(&scrub->os_thread)) {
result = -EINPROGRESS;
} else if (!dev->od_noscrub) {
- result = osd_scrub_start(dev);
- LCONSOLE_WARN("%.16s: trigger OI scrub by RPC "
- "for "DFID", rc = %d [1]\n",
- osd_name(dev), PFID(fid),result);
+ /* Since we do not know the right OI mapping,
+ * we have to trigger OI scrub to scan the
+ * whole device. */
+ result = osd_scrub_start(dev, SS_AUTO_FULL |
+ SS_CLEAR_DRYRUN | SS_CLEAR_FAILOUT);
+ CDEBUG(D_LFSCK | D_CONSOLE, "%.16s: trigger OI "
+ "scrub by RPC for "DFID", rc = %d [1]\n",
+ osd_name(dev), PFID(fid),result);
if (result == 0 || result == -EALREADY)
result = -EINPROGRESS;
else
/*
* Concurrency: shouldn't matter.
*/
-int osd_trans_start(const struct lu_env *env, struct dt_device *d,
- struct thandle *th)
+static int osd_trans_start(const struct lu_env *env, struct dt_device *d,
+ struct thandle *th)
{
struct osd_thread_info *oti = osd_oti_get(env);
struct osd_device *dev = osd_dt_dev(d);
}
static int osd_seq_exists(const struct lu_env *env,
- struct osd_device *osd, obd_seq seq)
+ struct osd_device *osd, u64 seq)
{
struct lu_seq_range *range = &osd_oti_get(env)->oti_seq_range;
struct seq_server_site *ss = osd_seq_site(osd);
*/
static int osd_sync(const struct lu_env *env, struct dt_device *d)
{
- CDEBUG(D_HA, "syncing OSD %s\n", LUSTRE_OSD_LDISKFS_NAME);
- return ldiskfs_force_commit(osd_sb(osd_dt_dev(d)));
+ int rc;
+
+ CDEBUG(D_CACHE, "syncing OSD %s\n", LUSTRE_OSD_LDISKFS_NAME);
+
+ rc = ldiskfs_force_commit(osd_sb(osd_dt_dev(d)));
+
+ CDEBUG(D_CACHE, "synced OSD %s: rc = %d\n",
+ LUSTRE_OSD_LDISKFS_NAME, rc);
+
+ return rc;
}
/**
}
static int osd_attr_get(const struct lu_env *env,
- struct dt_object *dt,
- struct lu_attr *attr,
- struct lustre_capa *capa)
+ struct dt_object *dt,
+ struct lu_attr *attr,
+ struct lustre_capa *capa)
{
- struct osd_object *obj = osd_dt_obj(dt);
+ struct osd_object *obj = osd_dt_obj(dt);
- LASSERT(dt_object_exists(dt) && !dt_object_remote(dt));
- LINVRNT(osd_invariant(obj));
+ if (!dt_object_exists(dt))
+ return -ENOENT;
- if (osd_object_auth(env, dt, capa, CAPA_OPC_META_READ))
- return -EACCES;
+ LASSERT(!dt_object_remote(dt));
+ LINVRNT(osd_invariant(obj));
+
+ if (osd_object_auth(env, dt, capa, CAPA_OPC_META_READ))
+ return -EACCES;
spin_lock(&obj->oo_guard);
osd_inode_getattr(env, obj->oo_inode, attr);
}
static int osd_attr_set(const struct lu_env *env,
- struct dt_object *dt,
- const struct lu_attr *attr,
- struct thandle *handle,
- struct lustre_capa *capa)
+ struct dt_object *dt,
+ const struct lu_attr *attr,
+ struct thandle *handle,
+ struct lustre_capa *capa)
{
- struct osd_object *obj = osd_dt_obj(dt);
- struct inode *inode;
- int rc;
+ struct osd_object *obj = osd_dt_obj(dt);
+ struct inode *inode;
+ int rc;
- LASSERT(handle != NULL);
- LASSERT(dt_object_exists(dt) && !dt_object_remote(dt));
- LASSERT(osd_invariant(obj));
+ if (!dt_object_exists(dt))
+ return -ENOENT;
- if (osd_object_auth(env, dt, capa, CAPA_OPC_META_WRITE))
- return -EACCES;
+ LASSERT(handle != NULL);
+ LASSERT(!dt_object_remote(dt));
+ LASSERT(osd_invariant(obj));
+
+ if (osd_object_auth(env, dt, capa, CAPA_OPC_META_WRITE))
+ return -EACCES;
osd_trans_exec_op(env, handle, OSD_OT_ATTR_SET);
return rc;
}
-struct dentry *osd_child_dentry_get(const struct lu_env *env,
- struct osd_object *obj,
- const char *name, const int namelen)
+static struct dentry *osd_child_dentry_get(const struct lu_env *env,
+ struct osd_object *obj,
+ const char *name, const int namelen)
{
return osd_child_dentry_by_inode(env, obj->oo_inode, name, namelen);
}
osd_sb(osd)->s_root->d_inode,
mode);
if (!IS_ERR(inode)) {
- /* Do not update file c/mtime in ldiskfs.
- * NB: don't need any lock because no contention at this
- * early stage */
- inode->i_flags |= S_NOCMTIME;
+ /* Do not update file c/mtime in ldiskfs. */
+ inode->i_flags |= S_NOCMTIME;
/* For new created object, it must be consistent,
* and it is unnecessary to scrub against it. */
ldiskfs_set_inode_state(inode, LDISKFS_STATE_LUSTRE_NOSCRUB);
+
obj->oo_inode = inode;
result = 0;
} else {
result = osd_create_type_f(dof->dof_type)(info, obj, attr, hint, dof,
th);
- if (result == 0) {
+ if (result == 0) {
osd_attr_init(info, obj, attr, dof);
osd_object_init0(obj);
- /* bz 24037 */
- if (obj->oo_inode && (obj->oo_inode->i_state & I_NEW))
- unlock_new_inode(obj->oo_inode);
- }
+ }
+
+ if (obj->oo_inode != NULL) {
+ LASSERT(obj->oo_inode->i_state & I_NEW);
+
+ unlock_new_inode(obj->oo_inode);
+ }
/* restore previous umask value */
current->fs->umask = umask;
}
int osd_fld_lookup(const struct lu_env *env, struct osd_device *osd,
- obd_seq seq, struct lu_seq_range *range)
+ u64 seq, struct lu_seq_range *range)
{
struct seq_server_site *ss = osd_seq_site(osd);
}
static int osd_object_create(const struct lu_env *env, struct dt_object *dt,
- struct lu_attr *attr,
- struct dt_allocation_hint *hint,
- struct dt_object_format *dof,
- struct thandle *th)
+ struct lu_attr *attr,
+ struct dt_allocation_hint *hint,
+ struct dt_object_format *dof, struct thandle *th)
{
- const struct lu_fid *fid = lu_object_fid(&dt->do_lu);
- struct osd_object *obj = osd_dt_obj(dt);
- struct osd_thread_info *info = osd_oti_get(env);
- int result;
+ const struct lu_fid *fid = lu_object_fid(&dt->do_lu);
+ struct osd_object *obj = osd_dt_obj(dt);
+ struct osd_thread_info *info = osd_oti_get(env);
+ int result;
+ ENTRY;
- ENTRY;
+ if (dt_object_exists(dt))
+ return -EEXIST;
- LINVRNT(osd_invariant(obj));
- LASSERT(!dt_object_exists(dt) && !dt_object_remote(dt));
- LASSERT(osd_write_locked(env, obj));
- LASSERT(th != NULL);
+ LINVRNT(osd_invariant(obj));
+ LASSERT(!dt_object_remote(dt));
+ LASSERT(osd_write_locked(env, obj));
+ LASSERT(th != NULL);
if (unlikely(fid_is_acct(fid)))
/* Quota files can't be created from the kernel any more,
* \ldiskfs_dentry_param is used only to pass fid from osd to ldiskfs.
* its inmemory API.
*/
-void osd_get_ldiskfs_dirent_param(struct ldiskfs_dentry_param *param,
- const struct lu_fid *fid)
+static void osd_get_ldiskfs_dirent_param(struct ldiskfs_dentry_param *param,
+ const struct lu_fid *fid)
{
if (!fid_is_namespace_visible(fid) ||
OBD_FAIL_CHECK(OBD_FAIL_FID_IGIF)) {
RETURN(local);
}
+ ldiskfs_set_inode_state(local, LDISKFS_STATE_LUSTRE_NOSCRUB);
+ unlock_new_inode(local);
+
/* Set special LMA flag for local agent inode */
rc = osd_ea_fid_set(info, local, fid, 0, LMAI_AGENT);
if (rc != 0) {
* \retval -ve, on error
*/
static int osd_object_ea_create(const struct lu_env *env, struct dt_object *dt,
- struct lu_attr *attr,
- struct dt_allocation_hint *hint,
- struct dt_object_format *dof,
- struct thandle *th)
+ struct lu_attr *attr,
+ struct dt_allocation_hint *hint,
+ struct dt_object_format *dof,
+ struct thandle *th)
{
- const struct lu_fid *fid = lu_object_fid(&dt->do_lu);
- struct osd_object *obj = osd_dt_obj(dt);
- struct osd_thread_info *info = osd_oti_get(env);
- int result;
+ const struct lu_fid *fid = lu_object_fid(&dt->do_lu);
+ struct osd_object *obj = osd_dt_obj(dt);
+ struct osd_thread_info *info = osd_oti_get(env);
+ int result;
- ENTRY;
+ ENTRY;
- LASSERT(osd_invariant(obj));
- LASSERT(!dt_object_exists(dt) && !dt_object_remote(dt));
- LASSERT(osd_write_locked(env, obj));
- LASSERT(th != NULL);
+ if (dt_object_exists(dt))
+ RETURN(-EEXIST);
+
+ LASSERT(osd_invariant(obj));
+ LASSERT(!dt_object_remote(dt));
+ LASSERT(osd_write_locked(env, obj));
+ LASSERT(th != NULL);
if (unlikely(fid_is_acct(fid)))
/* Quota files can't be created from the kernel any more,
osd_trans_exec_op(env, th, OSD_OT_CREATE);
osd_trans_declare_rb(env, th, OSD_OT_REF_ADD);
- result = __osd_object_create(info, obj, attr, hint, dof, th);
- if (result == 0)
- result = osd_ea_fid_set(info, obj->oo_inode, fid,
+ result = __osd_object_create(info, obj, attr, hint, dof, th);
+ if (result == 0) {
+ if (fid_is_idif(fid) &&
+ !osd_dev(dt->do_lu.lo_dev)->od_index_in_idif) {
+ struct lu_fid *tfid = &info->oti_fid;
+ struct ost_id *oi = &info->oti_ostid;
+
+ fid_to_ostid(fid, oi);
+ ostid_to_fid(tfid, oi, 0);
+ result = osd_ea_fid_set(info, obj->oo_inode, tfid,
+ LMAC_FID_ON_OST, 0);
+ } else {
+ result = osd_ea_fid_set(info, obj->oo_inode, fid,
fid_is_on_ost(info, osd_obj2dev(obj),
fid, OI_CHECK_FLD) ?
LMAC_FID_ON_OST : 0, 0);
+ }
+ }
if (result == 0)
result = __osd_oi_insert(env, obj, fid, th);
* Concurrency: @dt is write locked.
*/
static int osd_object_ref_add(const struct lu_env *env,
- struct dt_object *dt, struct thandle *th)
+ struct dt_object *dt, struct thandle *th)
{
struct osd_object *obj = osd_dt_obj(dt);
struct inode *inode = obj->oo_inode;
struct osd_thandle *oh;
int rc = 0;
- LINVRNT(osd_invariant(obj));
- LASSERT(dt_object_exists(dt) && !dt_object_remote(dt));
- LASSERT(osd_write_locked(env, obj));
- LASSERT(th != NULL);
+ if (!dt_object_exists(dt))
+ return -ENOENT;
- oh = container_of0(th, struct osd_thandle, ot_super);
- LASSERT(oh->ot_handle != NULL);
+ LINVRNT(osd_invariant(obj));
+ LASSERT(!dt_object_remote(dt));
+ LASSERT(osd_write_locked(env, obj));
+ LASSERT(th != NULL);
+
+ oh = container_of0(th, struct osd_thandle, ot_super);
+ LASSERT(oh->ot_handle != NULL);
osd_trans_exec_op(env, th, OSD_OT_REF_ADD);
}
static int osd_declare_object_ref_del(const struct lu_env *env,
- struct dt_object *dt,
- struct thandle *handle)
+ struct dt_object *dt,
+ struct thandle *handle)
{
- struct osd_thandle *oh;
+ struct osd_thandle *oh;
- LASSERT(dt_object_exists(dt) && !dt_object_remote(dt));
- LASSERT(handle != NULL);
+ LASSERT(!dt_object_remote(dt));
+ LASSERT(handle != NULL);
- oh = container_of0(handle, struct osd_thandle, ot_super);
- LASSERT(oh->ot_handle == NULL);
+ oh = container_of0(handle, struct osd_thandle, ot_super);
+ LASSERT(oh->ot_handle == NULL);
osd_trans_declare_op(env, oh, OSD_OT_REF_DEL,
osd_dto_credits_noquota[DTO_ATTR_SET_BASE]);
* Concurrency: @dt is write locked.
*/
static int osd_object_ref_del(const struct lu_env *env, struct dt_object *dt,
- struct thandle *th)
+ struct thandle *th)
{
struct osd_object *obj = osd_dt_obj(dt);
struct inode *inode = obj->oo_inode;
struct osd_device *osd = osd_dev(dt->do_lu.lo_dev);
struct osd_thandle *oh;
+ if (!dt_object_exists(dt))
+ return -ENOENT;
+
LINVRNT(osd_invariant(obj));
- LASSERT(dt_object_exists(dt) && !dt_object_remote(dt));
+ LASSERT(!dt_object_remote(dt));
LASSERT(osd_write_locked(env, obj));
LASSERT(th != NULL);
- oh = container_of0(th, struct osd_thandle, ot_super);
- LASSERT(oh->ot_handle != NULL);
+ oh = container_of0(th, struct osd_thandle, ot_super);
+ LASSERT(oh->ot_handle != NULL);
osd_trans_exec_op(env, th, OSD_OT_REF_DEL);
return sizeof(dt_obj_version_t);
}
- LASSERT(dt_object_exists(dt) && !dt_object_remote(dt));
- LASSERT(inode->i_op != NULL && inode->i_op->getxattr != NULL);
+ if (!dt_object_exists(dt))
+ return -ENOENT;
- if (osd_object_auth(env, dt, capa, CAPA_OPC_META_READ))
- return -EACCES;
+ LASSERT(!dt_object_remote(dt));
+ LASSERT(inode->i_op != NULL);
+ LASSERT(inode->i_op->getxattr != NULL);
+
+ if (osd_object_auth(env, dt, capa, CAPA_OPC_META_READ))
+ return -EACCES;
return __osd_xattr_get(inode, dentry, name, buf->lb_buf, buf->lb_len);
}
* Concurrency: @dt is read locked.
*/
static int osd_xattr_list(const struct lu_env *env, struct dt_object *dt,
- struct lu_buf *buf, struct lustre_capa *capa)
+ const struct lu_buf *buf, struct lustre_capa *capa)
{
- struct osd_object *obj = osd_dt_obj(dt);
- struct inode *inode = obj->oo_inode;
- struct osd_thread_info *info = osd_oti_get(env);
- struct dentry *dentry = &info->oti_obj_dentry;
+ struct osd_object *obj = osd_dt_obj(dt);
+ struct inode *inode = obj->oo_inode;
+ struct osd_thread_info *info = osd_oti_get(env);
+ struct dentry *dentry = &info->oti_obj_dentry;
- LASSERT(dt_object_exists(dt) && !dt_object_remote(dt));
- LASSERT(inode->i_op != NULL && inode->i_op->listxattr != NULL);
+ if (!dt_object_exists(dt))
+ return -ENOENT;
- if (osd_object_auth(env, dt, capa, CAPA_OPC_META_READ))
- return -EACCES;
+ LASSERT(!dt_object_remote(dt));
+ LASSERT(inode->i_op != NULL);
+ LASSERT(inode->i_op->listxattr != NULL);
- dentry->d_inode = inode;
+ if (osd_object_auth(env, dt, capa, CAPA_OPC_META_READ))
+ return -EACCES;
+
+ dentry->d_inode = inode;
dentry->d_sb = inode->i_sb;
- return inode->i_op->listxattr(dentry, buf->lb_buf, buf->lb_len);
+ return inode->i_op->listxattr(dentry, buf->lb_buf, buf->lb_len);
}
static int osd_declare_xattr_del(const struct lu_env *env,
- struct dt_object *dt, const char *name,
- struct thandle *handle)
+ struct dt_object *dt, const char *name,
+ struct thandle *handle)
{
- struct osd_thandle *oh;
+ struct osd_thandle *oh;
struct super_block *sb = osd_sb(osd_dev(dt->do_lu.lo_dev));
- LASSERT(dt_object_exists(dt) && !dt_object_remote(dt));
- LASSERT(handle != NULL);
+ LASSERT(!dt_object_remote(dt));
+ LASSERT(handle != NULL);
- oh = container_of0(handle, struct osd_thandle, ot_super);
- LASSERT(oh->ot_handle == NULL);
+ oh = container_of0(handle, struct osd_thandle, ot_super);
+ LASSERT(oh->ot_handle == NULL);
osd_trans_declare_op(env, oh, OSD_OT_XATTR_SET,
osd_dto_credits_noquota[DTO_XATTR_SET]);
* Concurrency: @dt is write locked.
*/
static int osd_xattr_del(const struct lu_env *env, struct dt_object *dt,
- const char *name, struct thandle *handle,
- struct lustre_capa *capa)
+ const char *name, struct thandle *handle,
+ struct lustre_capa *capa)
{
- struct osd_object *obj = osd_dt_obj(dt);
- struct inode *inode = obj->oo_inode;
- struct osd_thread_info *info = osd_oti_get(env);
- struct dentry *dentry = &info->oti_obj_dentry;
- int rc;
+ struct osd_object *obj = osd_dt_obj(dt);
+ struct inode *inode = obj->oo_inode;
+ struct osd_thread_info *info = osd_oti_get(env);
+ struct dentry *dentry = &info->oti_obj_dentry;
+ int rc;
- LASSERT(dt_object_exists(dt) && !dt_object_remote(dt));
- LASSERT(inode->i_op != NULL && inode->i_op->removexattr != NULL);
- LASSERT(handle != NULL);
+ if (!dt_object_exists(dt))
+ return -ENOENT;
- if (osd_object_auth(env, dt, capa, CAPA_OPC_META_WRITE))
- return -EACCES;
+ LASSERT(!dt_object_remote(dt));
+ LASSERT(inode->i_op != NULL);
+ LASSERT(inode->i_op->removexattr != NULL);
+ LASSERT(handle != NULL);
+
+ if (osd_object_auth(env, dt, capa, CAPA_OPC_META_WRITE))
+ return -EACCES;
osd_trans_exec_op(env, handle, OSD_OT_XATTR_SET);
ll_vfs_dq_init(inode);
- dentry->d_inode = inode;
+ dentry->d_inode = inode;
dentry->d_sb = inode->i_sb;
- rc = inode->i_op->removexattr(dentry, name);
- return rc;
+ rc = inode->i_op->removexattr(dentry, name);
+ return rc;
}
static struct obd_capa *osd_capa_get(const struct lu_env *env,
if (!osd->od_fl_capa)
RETURN(ERR_PTR(-ENOENT));
- LASSERT(dt_object_exists(dt) && !dt_object_remote(dt));
+ if (!dt_object_exists(dt))
+ RETURN(ERR_PTR(-ENOENT));
+
+ LASSERT(!dt_object_remote(dt));
LINVRNT(osd_invariant(obj));
/* renewal sanity check */
file->f_op = inode->i_fop;
set_file_inode(file, inode);
-#ifdef HAVE_FILE_FSYNC_4ARGS
- rc = file->f_op->fsync(file, start, end, 0);
-#elif defined(HAVE_FILE_FSYNC_2ARGS)
- mutex_lock(&inode->i_mutex);
- rc = file->f_op->fsync(file, 0);
- mutex_unlock(&inode->i_mutex);
-#else
- mutex_lock(&inode->i_mutex);
- rc = file->f_op->fsync(file, dentry, 0);
- mutex_unlock(&inode->i_mutex);
-#endif
+ rc = ll_vfs_fsync_range(file, start, end, 0);
RETURN(rc);
}
* \retval 0 success
* \retval -ve failure
*/
-
static int osd_index_iam_delete(const struct lu_env *env, struct dt_object *dt,
- const struct dt_key *key,
- struct thandle *handle,
- struct lustre_capa *capa)
+ const struct dt_key *key,
+ struct thandle *handle,
+ struct lustre_capa *capa)
{
- struct osd_thread_info *oti = osd_oti_get(env);
- struct osd_object *obj = osd_dt_obj(dt);
- struct osd_thandle *oh;
- struct iam_path_descr *ipd;
- struct iam_container *bag = &obj->oo_dir->od_container;
- int rc;
+ struct osd_thread_info *oti = osd_oti_get(env);
+ struct osd_object *obj = osd_dt_obj(dt);
+ struct osd_thandle *oh;
+ struct iam_path_descr *ipd;
+ struct iam_container *bag = &obj->oo_dir->od_container;
+ int rc;
+ ENTRY;
- ENTRY;
+ if (!dt_object_exists(dt))
+ RETURN(-ENOENT);
- LINVRNT(osd_invariant(obj));
- LASSERT(dt_object_exists(dt) && !dt_object_remote(dt));
- LASSERT(bag->ic_object == obj->oo_inode);
- LASSERT(handle != NULL);
+ LINVRNT(osd_invariant(obj));
+ LASSERT(!dt_object_remote(dt));
+ LASSERT(bag->ic_object == obj->oo_inode);
+ LASSERT(handle != NULL);
- if (osd_object_auth(env, dt, capa, CAPA_OPC_INDEX_DELETE))
- RETURN(-EACCES);
+ if (osd_object_auth(env, dt, capa, CAPA_OPC_INDEX_DELETE))
+ RETURN(-EACCES);
osd_trans_exec_op(env, handle, OSD_OT_DELETE);
int rc;
ENTRY;
- LASSERT(dt_object_exists(dt) && !dt_object_remote(dt));
+ LASSERT(!dt_object_remote(dt));
LASSERT(handle != NULL);
oh = container_of0(handle, struct osd_thandle, ot_super);
* \retval -ve, on error
*/
static int osd_index_ea_delete(const struct lu_env *env, struct dt_object *dt,
- const struct dt_key *key,
- struct thandle *handle,
- struct lustre_capa *capa)
+ const struct dt_key *key, struct thandle *handle,
+ struct lustre_capa *capa)
{
- struct osd_object *obj = osd_dt_obj(dt);
- struct inode *dir = obj->oo_inode;
- struct dentry *dentry;
- struct osd_thandle *oh;
+ struct osd_object *obj = osd_dt_obj(dt);
+ struct inode *dir = obj->oo_inode;
+ struct dentry *dentry;
+ struct osd_thandle *oh;
struct ldiskfs_dir_entry_2 *de = NULL;
- struct buffer_head *bh;
- struct htree_lock *hlock = NULL;
+ struct buffer_head *bh;
+ struct htree_lock *hlock = NULL;
struct lu_fid *fid = &osd_oti_get(env)->oti_fid;
struct osd_device *osd = osd_dev(dt->do_lu.lo_dev);
int rc;
- ENTRY;
+ ENTRY;
- LINVRNT(osd_invariant(obj));
- LASSERT(dt_object_exists(dt) && !dt_object_remote(dt));
- LASSERT(handle != NULL);
+ if (!dt_object_exists(dt))
+ RETURN(-ENOENT);
+
+ LINVRNT(osd_invariant(obj));
+ LASSERT(!dt_object_remote(dt));
+ LASSERT(handle != NULL);
osd_trans_exec_op(env, handle, OSD_OT_DELETE);
* \retval -ve failure
*/
static int osd_index_iam_lookup(const struct lu_env *env, struct dt_object *dt,
- struct dt_rec *rec, const struct dt_key *key,
- struct lustre_capa *capa)
+ struct dt_rec *rec, const struct dt_key *key,
+ struct lustre_capa *capa)
{
- struct osd_object *obj = osd_dt_obj(dt);
- struct iam_path_descr *ipd;
- struct iam_container *bag = &obj->oo_dir->od_container;
- struct osd_thread_info *oti = osd_oti_get(env);
- struct iam_iterator *it = &oti->oti_idx_it;
- struct iam_rec *iam_rec;
- int rc;
+ struct osd_object *obj = osd_dt_obj(dt);
+ struct iam_path_descr *ipd;
+ struct iam_container *bag = &obj->oo_dir->od_container;
+ struct osd_thread_info *oti = osd_oti_get(env);
+ struct iam_iterator *it = &oti->oti_idx_it;
+ struct iam_rec *iam_rec;
+ int rc;
+ ENTRY;
- ENTRY;
+ if (!dt_object_exists(dt))
+ RETURN(-ENOENT);
- LASSERT(osd_invariant(obj));
- LASSERT(dt_object_exists(dt) && !dt_object_remote(dt));
- LASSERT(bag->ic_object == obj->oo_inode);
+ LASSERT(osd_invariant(obj));
+ LASSERT(!dt_object_remote(dt));
+ LASSERT(bag->ic_object == obj->oo_inode);
if (osd_object_auth(env, dt, capa, CAPA_OPC_INDEX_LOOKUP))
RETURN(-EACCES);
* \retval -ve failure
*/
static int osd_index_iam_insert(const struct lu_env *env, struct dt_object *dt,
- const struct dt_rec *rec,
- const struct dt_key *key, struct thandle *th,
- struct lustre_capa *capa, int ignore_quota)
-{
- struct osd_object *obj = osd_dt_obj(dt);
- struct iam_path_descr *ipd;
- struct osd_thandle *oh;
- struct iam_container *bag = &obj->oo_dir->od_container;
- struct osd_thread_info *oti = osd_oti_get(env);
- struct iam_rec *iam_rec;
- int rc;
+ const struct dt_rec *rec,
+ const struct dt_key *key, struct thandle *th,
+ struct lustre_capa *capa, int ignore_quota)
+{
+ struct osd_object *obj = osd_dt_obj(dt);
+ struct iam_path_descr *ipd;
+ struct osd_thandle *oh;
+ struct iam_container *bag;
+ struct osd_thread_info *oti = osd_oti_get(env);
+ struct iam_rec *iam_rec;
+ int rc;
+ ENTRY;
- ENTRY;
+ if (!dt_object_exists(dt))
+ RETURN(-ENOENT);
- LINVRNT(osd_invariant(obj));
- LASSERT(dt_object_exists(dt) && !dt_object_remote(dt));
- LASSERT(bag->ic_object == obj->oo_inode);
- LASSERT(th != NULL);
+ LINVRNT(osd_invariant(obj));
+ LASSERT(!dt_object_remote(dt));
+
+ bag = &obj->oo_dir->od_container;
+ LASSERT(bag->ic_object == obj->oo_inode);
+ LASSERT(th != NULL);
- if (osd_object_auth(env, dt, capa, CAPA_OPC_INDEX_INSERT))
+ if (osd_object_auth(env, dt, capa, CAPA_OPC_INDEX_INSERT))
RETURN(-EACCES);
osd_trans_exec_op(env, th, OSD_OT_INSERT);
else
de->file_type = LDISKFS_DIRENT_LUFID |
LDISKFS_FT_DIR;
- ldiskfs_journal_dirty_metadata(oth->ot_handle,
- bh);
+ ldiskfs_handle_dirty_metadata(oth->ot_handle,
+ NULL, bh);
brelse(bh);
}
}
dot_dot_fid, NULL, th);
}
- if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_PARENT) ||
- OBD_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_PARENT2)) {
+ if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_PARENT)) {
struct lu_fid tfid = *dot_dot_fid;
tfid.f_oid--;
if (!fid_is_norm(fid) && !fid_is_igif(fid))
RETURN_EXIT;
+ if (scrub->os_pos_current > id->oii_ino)
+ RETURN_EXIT;
+
again:
rc = osd_oi_lookup(oti, dev, fid, id, OI_CHECK_FLD);
if (rc != 0 && rc != -ENOENT)
}
if (!dev->od_noscrub && ++once == 1) {
- rc = osd_scrub_start(dev);
- LCONSOLE_WARN("%.16s: trigger OI scrub by RPC for "DFID
- ", rc = %d [2]\n",
- LDISKFS_SB(osd_sb(dev))->s_es->s_volume_name,
- PFID(fid), rc);
- if (rc == 0)
+ rc = osd_scrub_start(dev, SS_AUTO_PARTIAL | SS_CLEAR_DRYRUN |
+ SS_CLEAR_FAILOUT);
+ CDEBUG(D_LFSCK | D_CONSOLE, "%.16s: trigger OI scrub by RPC "
+ "for "DFID", rc = %d [2]\n",
+ LDISKFS_SB(osd_sb(dev))->s_es->s_volume_name,
+ PFID(fid), rc);
+ if (rc == 0 || rc == -EALREADY)
goto again;
}
return rc;
}
-int osd_add_oi_cache(struct osd_thread_info *info, struct osd_device *osd,
- struct osd_inode_id *id, const struct lu_fid *fid)
+void osd_add_oi_cache(struct osd_thread_info *info, struct osd_device *osd,
+ struct osd_inode_id *id, const struct lu_fid *fid)
{
CDEBUG(D_INODE, "add "DFID" %u:%u to info %p\n", PFID(fid),
id->oii_ino, id->oii_gen, info);
info->oti_cache.oic_lid = *id;
info->oti_cache.oic_fid = *fid;
info->oti_cache.oic_dev = osd;
-
- return 0;
}
/**
struct lu_buf *buf = &oti->oti_big_buf;
struct dentry *dentry = &oti->oti_obj_dentry;
struct inode *inode = obj->oo_inode;
- struct linkea_data ldata = { 0 };
+ struct linkea_data ldata = { NULL };
int rc;
ENTRY;
* \retval -ve, on error
*/
static int osd_ea_lookup_rec(const struct lu_env *env, struct osd_object *obj,
- struct dt_rec *rec, const struct dt_key *key)
-{
- struct inode *dir = obj->oo_inode;
- struct dentry *dentry;
- struct ldiskfs_dir_entry_2 *de;
- struct buffer_head *bh;
- struct lu_fid *fid = (struct lu_fid *) rec;
- struct htree_lock *hlock = NULL;
- int ino;
- int rc;
+ struct dt_rec *rec, const struct dt_key *key)
+{
+ struct inode *dir = obj->oo_inode;
+ struct dentry *dentry;
+ struct ldiskfs_dir_entry_2 *de;
+ struct buffer_head *bh;
+ struct lu_fid *fid = (struct lu_fid *) rec;
+ struct htree_lock *hlock = NULL;
+ int ino;
+ int rc;
ENTRY;
- LASSERT(dir->i_op != NULL && dir->i_op->lookup != NULL);
+ LASSERT(dir->i_op != NULL);
+ LASSERT(dir->i_op->lookup != NULL);
- dentry = osd_child_dentry_get(env, obj,
- (char *)key, strlen((char *)key));
+ dentry = osd_child_dentry_get(env, obj,
+ (char *)key, strlen((char *)key));
- if (obj->oo_hl_head != NULL) {
- hlock = osd_oti_get(env)->oti_hlock;
- ldiskfs_htree_lock(hlock, obj->oo_hl_head,
- dir, LDISKFS_HLOCK_LOOKUP);
- } else {
+ if (obj->oo_hl_head != NULL) {
+ hlock = osd_oti_get(env)->oti_hlock;
+ ldiskfs_htree_lock(hlock, obj->oo_hl_head,
+ dir, LDISKFS_HLOCK_LOOKUP);
+ } else {
down_read(&obj->oo_ext_idx_sem);
- }
+ }
- bh = osd_ldiskfs_find_entry(dir, &dentry->d_name, &de, NULL, hlock);
- if (bh) {
+ bh = osd_ldiskfs_find_entry(dir, &dentry->d_name, &de, NULL, hlock);
+ if (bh) {
struct osd_thread_info *oti = osd_oti_get(env);
struct osd_inode_id *id = &oti->oti_id;
struct osd_idmap_cache *oic = &oti->oti_cache;
struct osd_device *dev = osd_obj2dev(obj);
- struct osd_scrub *scrub = &dev->od_scrub;
- struct scrub_file *sf = &scrub->os_file;
ino = le32_to_cpu(de->inode);
if (OBD_FAIL_CHECK(OBD_FAIL_FID_LOOKUP)) {
if (osd_remote_fid(env, dev, fid))
GOTO(out, rc = 0);
- rc = osd_add_oi_cache(osd_oti_get(env), osd_obj2dev(obj), id,
- fid);
- if (rc != 0)
- GOTO(out, rc);
- if ((scrub->os_pos_current <= ino) &&
- ((sf->sf_flags & SF_INCONSISTENT) ||
- (sf->sf_flags & SF_UPGRADE && fid_is_igif(fid)) ||
- ldiskfs_test_bit(osd_oi_fid2idx(dev, fid),
- sf->sf_oi_bitmap)))
- osd_consistency_check(oti, dev, oic);
+ osd_add_oi_cache(osd_oti_get(env), osd_obj2dev(obj), id, fid);
+ osd_consistency_check(oti, dev, oic);
} else {
rc = -ENOENT;
}
* \retval osd_object on success
* \retval -ve on error
*/
-struct osd_object *osd_object_find(const struct lu_env *env,
- struct dt_object *dt,
- const struct lu_fid *fid)
+static struct osd_object *osd_object_find(const struct lu_env *env,
+ struct dt_object *dt,
+ const struct lu_fid *fid)
{
struct lu_device *ludev = dt->do_lu.lo_dev;
struct osd_object *child = NULL;
int rc;
ENTRY;
+ if (!dt_object_exists(dt))
+ RETURN(-ENOENT);
+
LASSERT(osd_invariant(obj));
- LASSERT(dt_object_exists(dt) && !dt_object_remote(dt));
+ LASSERT(!dt_object_remote(dt));
LASSERT(th != NULL);
osd_trans_exec_op(env, th, OSD_OT_INSERT);
__u32 unused,
struct lustre_capa *capa)
{
- struct osd_it_iam *it;
- struct osd_thread_info *oti = osd_oti_get(env);
- struct osd_object *obj = osd_dt_obj(dt);
- struct lu_object *lo = &dt->do_lu;
- struct iam_path_descr *ipd;
- struct iam_container *bag = &obj->oo_dir->od_container;
+ struct osd_it_iam *it;
+ struct osd_object *obj = osd_dt_obj(dt);
+ struct lu_object *lo = &dt->do_lu;
+ struct iam_path_descr *ipd;
+ struct iam_container *bag = &obj->oo_dir->od_container;
- LASSERT(lu_object_exists(lo));
+ if (!dt_object_exists(dt))
+ return ERR_PTR(-ENOENT);
- if (osd_object_auth(env, dt, capa, CAPA_OPC_BODY_READ))
- return ERR_PTR(-EACCES);
+ if (osd_object_auth(env, dt, capa, CAPA_OPC_BODY_READ))
+ return ERR_PTR(-EACCES);
- if (oti->oti_it_inline) {
- OBD_ALLOC_PTR(it);
- if (it == NULL)
- return ERR_PTR(-ENOMEM);
- } else {
- it = &oti->oti_it;
- oti->oti_it_inline = 1;
- }
+ OBD_ALLOC_PTR(it);
+ if (it == NULL)
+ return ERR_PTR(-ENOMEM);
ipd = osd_it_ipd_get(env, bag);
if (likely(ipd != NULL)) {
iam_it_init(&it->oi_it, bag, IAM_IT_MOVE, ipd);
return (struct dt_it *)it;
} else {
- if (it != &oti->oti_it)
- OBD_FREE_PTR(it);
- else
- oti->oti_it_inline = 0;
-
+ OBD_FREE_PTR(it);
return ERR_PTR(-ENOMEM);
}
}
static void osd_it_iam_fini(const struct lu_env *env, struct dt_it *di)
{
- struct osd_thread_info *oti = osd_oti_get(env);
struct osd_it_iam *it = (struct osd_it_iam *)di;
struct osd_object *obj = it->oi_obj;
iam_it_fini(&it->oi_it);
osd_ipd_put(env, &obj->oo_dir->od_container, it->oi_ipd);
lu_object_put(env, &obj->oo_dt.do_lu);
- if (it != &oti->oti_it)
- OBD_FREE_PTR(it);
- else
- oti->oti_it_inline = 0;
+ OBD_FREE_PTR(it);
}
/**
{
struct osd_object *obj = osd_dt_obj(dt);
struct osd_thread_info *info = osd_oti_get(env);
- struct osd_it_ea *it;
+ struct osd_it_ea *oie;
struct file *file;
struct lu_object *lo = &dt->do_lu;
- struct dentry *obj_dentry = &info->oti_it_dentry;
+ struct dentry *obj_dentry;
ENTRY;
- LASSERT(lu_object_exists(lo));
+ if (!dt_object_exists(dt))
+ RETURN(ERR_PTR(-ENOENT));
- if (info->oti_it_inline) {
- OBD_ALLOC_PTR(it);
- if (it == NULL)
- RETURN(ERR_PTR(-ENOMEM));
- } else {
- it = &info->oti_it_ea;
- info->oti_it_inline = 1;
- }
+ OBD_SLAB_ALLOC_PTR_GFP(oie, osd_itea_cachep, GFP_NOFS);
+ if (oie == NULL)
+ RETURN(ERR_PTR(-ENOMEM));
+ obj_dentry = &oie->oie_dentry;
obj_dentry->d_inode = obj->oo_inode;
obj_dentry->d_sb = osd_sb(osd_obj2dev(obj));
obj_dentry->d_name.hash = 0;
- it->oie_rd_dirent = 0;
- it->oie_it_dirent = 0;
- it->oie_dirent = NULL;
- it->oie_buf = info->oti_it_ea_buf;
- it->oie_obj = obj;
+ oie->oie_rd_dirent = 0;
+ oie->oie_it_dirent = 0;
+ oie->oie_dirent = NULL;
+ if (unlikely(!info->oti_it_ea_buf_used)) {
+ oie->oie_buf = info->oti_it_ea_buf;
+ info->oti_it_ea_buf_used = 1;
+ } else {
+ OBD_ALLOC(oie->oie_buf, OSD_IT_EA_BUFSIZE);
+ if (oie->oie_buf == NULL)
+ RETURN(ERR_PTR(-ENOMEM));
+ }
+ oie->oie_obj = obj;
+
+ file = &oie->oie_file;
- file = &it->oie_file;
- /* Reset the "file" totally to avoid to reuse any old value from
- * former readdir handling, the "file->f_pos" should be zero. */
- memset(file, 0, sizeof(*file));
/* Only FMODE_64BITHASH or FMODE_32BITHASH should be set, NOT both. */
if (attr & LUDA_64BITHASH)
file->f_mode = FMODE_64BITHASH;
set_file_inode(file, obj->oo_inode);
lu_object_get(lo);
- RETURN((struct dt_it *) it);
+ RETURN((struct dt_it *) oie);
}
/**
*/
static void osd_it_ea_fini(const struct lu_env *env, struct dt_it *di)
{
- struct osd_thread_info *info = osd_oti_get(env);
- struct osd_it_ea *it = (struct osd_it_ea *)di;
- struct osd_object *obj = it->oie_obj;
- struct inode *inode = obj->oo_inode;
+ struct osd_thread_info *info = osd_oti_get(env);
+ struct osd_it_ea *oie = (struct osd_it_ea *)di;
+ struct osd_object *obj = oie->oie_obj;
+ struct inode *inode = obj->oo_inode;
- ENTRY;
- it->oie_file.f_op->release(inode, &it->oie_file);
- lu_object_put(env, &obj->oo_dt.do_lu);
- if (it != &info->oti_it_ea)
- OBD_FREE_PTR(it);
+ ENTRY;
+ oie->oie_file.f_op->release(inode, &oie->oie_file);
+ lu_object_put(env, &obj->oo_dt.do_lu);
+ if (unlikely(oie->oie_buf != info->oti_it_ea_buf))
+ OBD_FREE(oie->oie_buf, OSD_IT_EA_BUFSIZE);
else
- info->oti_it_inline = 0;
+ info->oti_it_ea_buf_used = 0;
+ OBD_SLAB_FREE_PTR(oie, osd_itea_cachep);
EXIT;
}
rec = (struct osd_fid_pack *)(de->name + de->name_len + 1);
fid_cpu_to_be((struct lu_fid *)rec->fp_area, fid);
- rc = ldiskfs_journal_dirty_metadata(jh, bh);
+ rc = ldiskfs_handle_dirty_metadata(jh, NULL, bh);
RETURN(rc);
}
fid_cpu_to_be((struct lu_fid *)rec->fp_area, fid);
de->file_type |= LDISKFS_DIRENT_LUFID;
- rc = ldiskfs_journal_dirty_metadata(jh, bh);
+ rc = ldiskfs_handle_dirty_metadata(jh, NULL, bh);
RETURN(rc);
}
osd_dto_credits_noquota[DTO_INDEX_INSERT] + 1 + 1 + 2;
again:
- if (dev->od_dirent_journal) {
+ if (dev->od_dirent_journal != 0) {
jh = osd_journal_start_sb(sb, LDISKFS_HT_MISC, credits);
if (IS_ERR(jh)) {
rc = PTR_ERR(jh);
GOTO(out_inode, rc = 0);
}
- if (!dev->od_dirent_journal) {
+ if (dev->od_dirent_journal == 0) {
iput(inode);
brelse(bh);
if (hlock != NULL)
GOTO(out_inode, rc = 0);
}
- if (!dev->od_dirent_journal) {
+ if (dev->od_dirent_journal == 0) {
iput(inode);
brelse(bh);
if (hlock != NULL)
GOTO(out_inode, rc = 0);
}
- if (!dev->od_dirent_journal) {
+ if (dev->od_dirent_journal == 0) {
iput(inode);
brelse(bh);
if (hlock != NULL)
if (hlock != NULL) {
ldiskfs_htree_unlock(hlock);
} else {
- if (dev->od_dirent_journal)
+ if (dev->od_dirent_journal != 0)
up_write(&obj->oo_ext_idx_sem);
else
up_read(&obj->oo_ext_idx_sem);
struct osd_it_ea *it = (struct osd_it_ea *)di;
struct osd_object *obj = it->oie_obj;
struct osd_device *dev = osd_obj2dev(obj);
- struct osd_scrub *scrub = &dev->od_scrub;
- struct scrub_file *sf = &scrub->os_file;
struct osd_thread_info *oti = osd_oti_get(env);
struct osd_inode_id *id = &oti->oti_id;
- struct osd_idmap_cache *oic = &oti->oti_cache;
struct lu_fid *fid = &it->oie_dirent->oied_fid;
struct lu_dirent *lde = (struct lu_dirent *)dtrec;
__u32 ino = it->oie_dirent->oied_ino;
RETURN(0);
if (likely(!(attr & LUDA_IGNORE) && rc == 0))
- rc = osd_add_oi_cache(oti, dev, id, fid);
-
- if (!(attr & LUDA_VERIFY) &&
- (scrub->os_pos_current <= ino) &&
- ((sf->sf_flags & SF_INCONSISTENT) ||
- (sf->sf_flags & SF_UPGRADE && fid_is_igif(fid)) ||
- ldiskfs_test_bit(osd_oi_fid2idx(dev, fid), sf->sf_oi_bitmap)))
- osd_consistency_check(oti, dev, oic);
+ osd_add_oi_cache(oti, dev, id, fid);
RETURN(rc > 0 ? 0 : rc);
}
if (server_name_is_ost(o->od_svname))
o->od_is_ost = 1;
+ o->od_full_scrub_ratio = OFSR_DEFAULT;
+ o->od_full_scrub_threshold_rate = FULL_SCRUB_THRESHOLD_RATE_DEFAULT;
rc = osd_mount(env, o, cfg);
if (rc != 0)
GOTO(out_capa, rc);
if (rc != 0)
GOTO(out_site, rc);
- /* self-repair LMA by default */
- o->od_lma_self_repair = 1;
-
INIT_LIST_HEAD(&o->od_ios_list);
/* setup scrub, including OI files initialization */
rc = osd_scrub_setup(env, o);
GOTO(out_scrub, rc);
}
- LASSERT(l->ld_site->ls_linkage.next && l->ld_site->ls_linkage.prev);
+ LASSERT(l->ld_site->ls_linkage.next != NULL);
+ LASSERT(l->ld_site->ls_linkage.prev != NULL);
/* initialize quota slave instance */
o->od_quota_slave = qsd_init(env, o->od_svname, &o->od_dt_dev,
}
static int osd_prepare(const struct lu_env *env, struct lu_device *pdev,
- struct lu_device *dev)
+ struct lu_device *dev)
{
- struct osd_device *osd = osd_dev(dev);
- int result = 0;
+ struct osd_device *osd = osd_dev(dev);
+ struct lr_server_data *lsd =
+ &osd->od_dt_dev.dd_lu_dev.ld_site->ls_tgt->lut_lsd;
+ int result = 0;
ENTRY;
if (osd->od_quota_slave != NULL) {
RETURN(result);
}
+ if (lsd->lsd_feature_incompat & OBD_COMPAT_OST) {
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 52, 0)
+ if (lsd->lsd_feature_rocompat & OBD_ROCOMPAT_IDX_IN_IDIF) {
+ osd->od_index_in_idif = 1;
+ } else {
+ osd->od_index_in_idif = 0;
+ result = osd_register_proc_index_in_idif(osd);
+ if (result != 0)
+ RETURN(result);
+ }
+#else
+ osd->od_index_in_idif = 1;
+#endif
+ }
+
result = osd_fid_init(env, osd);
RETURN(result);
}
-int osd_fid_alloc(const struct lu_env *env, struct obd_export *exp,
- struct lu_fid *fid, struct md_op_data *op_data)
+static int osd_fid_alloc(const struct lu_env *env, struct obd_export *exp,
+ struct lu_fid *fid, struct md_op_data *op_data)
{
struct osd_device *osd = osd_dev(exp->exp_obd->obd_lu_dev);
.ldto_device_fini = osd_device_fini
};
-struct lu_device_type osd_device_type = {
+static struct lu_device_type osd_device_type = {
.ldt_tags = LU_DEVICE_DT,
.ldt_name = LUSTRE_OSD_LDISKFS_NAME,
.ldt_ops = &osd_device_type_ops,
.ldt_ctx_tags = LCT_LOCAL,
};
+static int osd_health_check(const struct lu_env *env, struct obd_device *obd)
+{
+ struct osd_device *osd = osd_dev(obd->obd_lu_dev);
+ struct super_block *sb = osd_sb(osd);
+
+ return (osd->od_mnt == NULL || sb->s_flags & MS_RDONLY);
+}
+
/*
* lprocfs legacy support.
*/
.o_connect = osd_obd_connect,
.o_disconnect = osd_obd_disconnect,
.o_fid_alloc = osd_fid_alloc,
+ .o_health_check = osd_health_check,
};
static int __init osd_mod_init(void)