* in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * 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
struct osd_object {
struct dt_object oo_dt;
- /*
+ /**
* Inode for file system object represented by this osd_object. This
* inode is pinned for the whole duration of lu_object life.
*
struct inode *oo_inode;
struct rw_semaphore oo_sem;
struct osd_directory *oo_dir;
- /* protects inode attributes. */
+ /** protects inode attributes. */
spinlock_t oo_guard;
-#if OSD_COUNTERS
const struct lu_env *oo_owner;
+#ifdef CONFIG_LOCKDEP
+ struct lockdep_map oo_dep_map;
#endif
};
static int osd_type_init (struct lu_device_type *t);
static void osd_type_fini (struct lu_device_type *t);
static int osd_object_init (const struct lu_env *env,
- struct lu_object *l);
+ struct lu_object *l,
+ const struct lu_object_conf *_);
static void osd_object_release(const struct lu_env *env,
struct lu_object *l);
static int osd_object_print (const struct lu_env *env, void *cookie,
struct txn_param *p);
static journal_t *osd_journal (const struct osd_device *dev);
-static struct lu_device_type_operations osd_device_type_ops;
+static const struct lu_device_type_operations osd_device_type_ops;
static struct lu_device_type osd_device_type;
-static struct lu_object_operations osd_lu_obj_ops;
+static const struct lu_object_operations osd_lu_obj_ops;
static struct obd_ops osd_obd_device_ops;
-static struct lu_device_operations osd_lu_ops;
+static const struct lu_device_operations osd_lu_ops;
static struct lu_context_key osd_key;
-static struct dt_object_operations osd_obj_ops;
-static struct dt_body_operations osd_body_ops;
-static struct dt_index_operations osd_index_ops;
-static struct dt_index_operations osd_index_compat_ops;
+static const struct dt_object_operations osd_obj_ops;
+static const struct dt_body_operations osd_body_ops;
+static const struct dt_index_operations osd_index_ops;
+static const struct dt_index_operations osd_index_compat_ops;
struct osd_thandle {
struct thandle ot_super;
handle_t *ot_handle;
struct journal_callback ot_jcb;
+ /* Link to the device, for debugging. */
+ struct lu_ref_link *ot_dev_link;
+
};
/*
return lu_context_key_get(&env->le_ctx, &osd_key);
}
-#if OSD_COUNTERS
/*
* Concurrency: doesn't matter
*/
return oti->oti_w_locks > 0 && o->oo_owner == env;
}
-#define OSD_COUNTERS_DO(exp) exp
-#else
-
-
-#define osd_read_locked(env, o) (1)
-#define osd_write_locked(env, o) (1)
-#define OSD_COUNTERS_DO(exp) ((void)0)
-#endif
-
/*
* Concurrency: doesn't access mutable data
*/
* Concurrency: no concurrent access is possible that early in object
* life-cycle.
*/
-static int osd_object_init(const struct lu_env *env, struct lu_object *l)
+static int osd_object_init(const struct lu_env *env, struct lu_object *l,
+ const struct lu_object_conf *_)
{
struct osd_object *obj = osd_obj(l);
int result;
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
result = osd_fid_lookup(env, obj, lu_object_fid(l));
if (result == 0) {
if (obj->oo_inode != NULL)
osd_object_init0(obj);
}
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
return result;
}
{
struct osd_object *obj = osd_obj(l);
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
dt_object_fini(&obj->oo_dt);
OBD_FREE_PTR(obj);
struct osd_object *obj = osd_obj(l);
struct inode *inode = obj->oo_inode;
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
/*
* If object is unlinked remove fid->ino mapping from object index.
struct osd_thandle *oh = container_of0(jcb, struct osd_thandle, ot_jcb);
struct thandle *th = &oh->ot_super;
struct dt_device *dev = th->th_dev;
+ struct lu_device *lud = &dev->dd_lu_dev;
LASSERT(dev != NULL);
LASSERT(oh->ot_handle == NULL);
lu_context_exit(&env->le_ctx);
}
- lu_device_put(&dev->dd_lu_dev);
+ lu_ref_del_at(&lud->ld_reference, oh->ot_dev_link, "osd-tx", th);
+ lu_device_put(lud);
th->th_dev = NULL;
lu_context_exit(&th->th_ctx);
if (osd_param_is_sane(dev, p)) {
OBD_ALLOC_GFP(oh, sizeof *oh, CFS_ALLOC_IO);
if (oh != NULL) {
+ struct osd_thread_info *oti = osd_oti_get(env);
+
/*
* XXX temporary stuff. Some abstraction layer should
* be used.
th->th_result = 0;
jh->h_sync = p->tp_sync;
lu_device_get(&d->dd_lu_dev);
+ oh->ot_dev_link = lu_ref_add
+ (&d->dd_lu_dev.ld_reference,
+ "osd-tx", th);
/* add commit callback */
lu_context_init(&th->th_ctx, LCT_TX_HANDLE);
lu_context_enter(&th->th_ctx);
journal_callback_set(jh, osd_trans_commit_cb,
(struct journal_callback *)&oh->ot_jcb);
-#if OSD_COUNTERS
- {
- struct osd_thread_info *oti =
- osd_oti_get(env);
-
LASSERT(oti->oti_txns == 0);
LASSERT(oti->oti_r_locks == 0);
LASSERT(oti->oti_w_locks == 0);
oti->oti_txns++;
- }
-#endif
} else {
OBD_FREE_PTR(oh);
th = (void *)jh;
{
int result;
struct osd_thandle *oh;
+ struct osd_thread_info *oti = osd_oti_get(env);
ENTRY;
oh = container_of0(th, struct osd_thandle, ot_super);
if (oh->ot_handle != NULL) {
handle_t *hdl = oh->ot_handle;
- /*
- * XXX temporary stuff. Some abstraction layer should be used.
- */
+
+ LASSERT(oti->oti_txns == 1);
+ oti->oti_txns--;
+ LASSERT(oti->oti_r_locks == 0);
+ LASSERT(oti->oti_w_locks == 0);
result = dt_txn_hook_stop(env, th);
if (result != 0)
CERROR("Failure in transaction hook: %d\n", result);
-
- /**/
oh->ot_handle = NULL;
result = journal_stop(hdl);
if (result != 0)
CERROR("Failure to stop transaction: %d\n", result);
-
-#if OSD_COUNTERS
- {
- struct osd_thread_info *oti = osd_oti_get(env);
-
- LASSERT(oti->oti_txns == 1);
- LASSERT(oti->oti_r_locks == 0);
- LASSERT(oti->oti_w_locks == 0);
- oti->oti_txns--;
- }
-#endif
}
EXIT;
}
return ldiskfs_force_commit(osd_sb(osd_dt_dev(d)));
}
+/**
+ * Start commit for OSD device.
+ *
+ * An implementation of dt_commit_async method for OSD device.
+ * Asychronously starts underlayng fs sync and thereby a transaction
+ * commit.
+ *
+ * \param env environment
+ * \param d dt device
+ *
+ * \see dt_device_operations
+ */
+static int osd_commit_async(const struct lu_env *env,
+ struct dt_device *d)
+{
+ struct super_block *s = osd_sb(osd_dt_dev(d));
+ ENTRY;
+
+ CDEBUG(D_HA, "async commit OSD %s\n", LUSTRE_OSD_NAME);
+ RETURN(s->s_op->sync_fs(s, 0));
+}
+
/*
* Concurrency: shouldn't matter.
*/
return osd_dto_credits[op];
}
-static struct dt_device_operations osd_dt_ops = {
+static const struct dt_device_operations osd_dt_ops = {
.dt_root_get = osd_root_get,
.dt_statfs = osd_statfs,
.dt_trans_start = osd_trans_start,
.dt_conf_get = osd_conf_get,
.dt_sync = osd_sync,
.dt_ro = osd_ro,
+ .dt_commit_async = osd_commit_async,
.dt_credit_get = osd_credit_get,
.dt_init_capa_ctxt = osd_init_capa_ctxt,
};
static void osd_object_read_lock(const struct lu_env *env,
- struct dt_object *dt)
+ struct dt_object *dt, unsigned role)
{
struct osd_object *obj = osd_dt_obj(dt);
+ struct osd_thread_info *oti = osd_oti_get(env);
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
- OSD_COUNTERS_DO(LASSERT(obj->oo_owner != env));
- down_read(&obj->oo_sem);
-#if OSD_COUNTERS
- {
- struct osd_thread_info *oti = osd_oti_get(env);
+ LASSERT(obj->oo_owner != env);
+ down_read_nested(&obj->oo_sem, role);
LASSERT(obj->oo_owner == NULL);
oti->oti_r_locks++;
- }
-#endif
}
static void osd_object_write_lock(const struct lu_env *env,
- struct dt_object *dt)
+ struct dt_object *dt, unsigned role)
{
struct osd_object *obj = osd_dt_obj(dt);
+ struct osd_thread_info *oti = osd_oti_get(env);
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
- OSD_COUNTERS_DO(LASSERT(obj->oo_owner != env));
- down_write(&obj->oo_sem);
-#if OSD_COUNTERS
- {
- struct osd_thread_info *oti = osd_oti_get(env);
+ LASSERT(obj->oo_owner != env);
+ down_write_nested(&obj->oo_sem, role);
LASSERT(obj->oo_owner == NULL);
obj->oo_owner = env;
oti->oti_w_locks++;
- }
-#endif
}
static void osd_object_read_unlock(const struct lu_env *env,
struct dt_object *dt)
{
struct osd_object *obj = osd_dt_obj(dt);
-
- LASSERT(osd_invariant(obj));
-#if OSD_COUNTERS
- {
struct osd_thread_info *oti = osd_oti_get(env);
+ LINVRNT(osd_invariant(obj));
+
LASSERT(oti->oti_r_locks > 0);
oti->oti_r_locks--;
- }
-#endif
up_read(&obj->oo_sem);
}
struct dt_object *dt)
{
struct osd_object *obj = osd_dt_obj(dt);
-
- LASSERT(osd_invariant(obj));
-#if OSD_COUNTERS
- {
struct osd_thread_info *oti = osd_oti_get(env);
+ LINVRNT(osd_invariant(obj));
+
LASSERT(obj->oo_owner == env);
LASSERT(oti->oti_w_locks > 0);
oti->oti_w_locks--;
obj->oo_owner = NULL;
- }
-#endif
up_write(&obj->oo_sem);
}
struct osd_object *obj = osd_dt_obj(dt);
LASSERT(dt_object_exists(dt));
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
if (osd_object_auth(env, dt, capa, CAPA_OPC_META_READ))
return -EACCES;
struct inode *parent;
struct inode *inode;
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
LASSERT(obj->oo_inode == NULL);
LASSERT(osd->od_obj_area != NULL);
result = 0;
} else
result = PTR_ERR(inode);
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
return result;
}
struct inode *dir;
umode_t mode = attr->la_mode & (S_IFMT | S_IRWXUGO | S_ISVTX);
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
LASSERT(obj->oo_inode == NULL);
LASSERT(osd->od_obj_area != NULL);
LASSERT(S_ISCHR(mode) || S_ISBLK(mode) ||
LASSERT(obj->oo_inode != NULL);
init_special_inode(obj->oo_inode, mode, attr->la_rdev);
}
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
return result;
}
ENTRY;
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
LASSERT(!dt_object_exists(dt));
LASSERT(osd_write_locked(env, obj));
LASSERT(th != NULL);
}
LASSERT(ergo(result == 0, dt_object_exists(dt)));
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
RETURN(result);
}
struct osd_object *obj = osd_dt_obj(dt);
struct inode *inode = obj->oo_inode;
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
LASSERT(dt_object_exists(dt));
LASSERT(osd_write_locked(env, obj));
LASSERT(th != NULL);
inode->i_nlink++;
spin_unlock(&obj->oo_guard);
mark_inode_dirty(inode);
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
}
/*
struct osd_object *obj = osd_dt_obj(dt);
struct inode *inode = obj->oo_inode;
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
LASSERT(dt_object_exists(dt));
LASSERT(osd_write_locked(env, obj));
LASSERT(th != NULL);
inode->i_nlink--;
spin_unlock(&obj->oo_guard);
mark_inode_dirty(inode);
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
}
/*
RETURN(ERR_PTR(-ENOENT));
LASSERT(dt_object_exists(dt));
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
/* renewal sanity check */
if (old && osd_object_auth(env, dt, old, opc))
RETURN(oc);
}
-static struct dt_object_operations osd_obj_ops = {
+static int osd_object_sync(const struct lu_env *env, struct dt_object *dt)
+{
+ 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_dentry;
+ struct file *file = &info->oti_file;
+ ENTRY;
+
+ dentry->d_inode = inode;
+ file->f_dentry = dentry;
+ file->f_mapping = inode->i_mapping;
+ file->f_op = inode->i_fop;
+ LOCK_INODE_MUTEX(inode);
+ rc = file->f_op->fsync(file, dentry, 0);
+ UNLOCK_INODE_MUTEX(inode);
+ RETURN(rc);
+}
+
+static const struct dt_object_operations osd_obj_ops = {
.do_read_lock = osd_object_read_lock,
.do_write_lock = osd_object_write_lock,
.do_read_unlock = osd_object_read_unlock,
.do_xattr_del = osd_xattr_del,
.do_xattr_list = osd_xattr_list,
.do_capa_get = osd_capa_get,
+ .do_object_sync = osd_object_sync,
};
/*
return result;
}
-static struct dt_body_operations osd_body_ops = {
+static const struct dt_body_operations osd_body_ops = {
.dbo_read = osd_read,
.dbo_write = osd_write
};
int result;
struct osd_object *obj = osd_dt_obj(dt);
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
LASSERT(dt_object_exists(dt));
if (osd_object_is_root(obj)) {
if (!osd_index_probe(env, obj, feat))
result = -ENOTDIR;
}
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
return result;
}
ENTRY;
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
LASSERT(dt_object_exists(dt));
LASSERT(bag->ic_object == obj->oo_inode);
LASSERT(handle != NULL);
rc = iam_delete(oh->ot_handle, bag, (const struct iam_key *)key, ipd);
osd_ipd_put(env, bag, ipd);
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
RETURN(rc);
}
ENTRY;
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
LASSERT(dt_object_exists(dt));
LASSERT(bag->ic_object == obj->oo_inode);
rc = iam_lookup(bag, (const struct iam_key *)key,
(struct iam_rec *)rec, ipd);
osd_ipd_put(env, bag, ipd);
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
RETURN(rc);
}
ENTRY;
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
LASSERT(dt_object_exists(dt));
LASSERT(bag->ic_object == obj->oo_inode);
LASSERT(th != NULL);
rc = iam_insert(oh->ot_handle, bag, (const struct iam_key *)key,
(struct iam_rec *)rec, ipd);
osd_ipd_put(env, bag, ipd);
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
RETURN(rc);
}
return iam_it_load(&it->oi_it, hash);
}
-static struct dt_index_operations osd_index_ops = {
+static const struct dt_index_operations osd_index_ops = {
.dio_lookup = osd_index_lookup,
.dio_insert = osd_index_insert,
.dio_delete = osd_index_delete,
struct dentry *dentry;
struct dentry *parent;
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
LASSERT(S_ISDIR(obj->oo_inode->i_mode));
LASSERT(osd_has_index(obj));
} else
result = -ENOMEM;
dput(parent);
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
return result;
}
int result;
LASSERT(S_ISDIR(obj->oo_inode->i_mode));
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
LASSERT(th != NULL);
if (osd_object_auth(env, dt, capa, CAPA_OPC_INDEX_INSERT))
if (result != 0)
return result;
- luch = lu_object_find(env, ludev->ld_site, fid);
+ luch = lu_object_find(env, ludev, fid, NULL);
if (!IS_ERR(luch)) {
if (lu_object_exists(luch)) {
struct osd_object *child;
CERROR("No osd slice.\n");
result = -ENOENT;
}
- LASSERT(osd_invariant(obj));
- LASSERT(osd_invariant(child));
+ LINVRNT(osd_invariant(obj));
+ LINVRNT(osd_invariant(child));
} else {
CERROR("Sorry.\n");
result = -ENOENT;
lu_object_put(env, luch);
} else
result = PTR_ERR(luch);
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
return result;
}
-static struct dt_index_operations osd_index_compat_ops = {
+static const struct dt_index_operations osd_index_compat_ops = {
.dio_lookup = osd_index_compat_lookup,
.dio_insert = osd_index_compat_insert,
.dio_delete = osd_index_compat_delete
static void osd_key_exit(const struct lu_context *ctx,
struct lu_context_key *key, void *data)
{
-#if OSD_COUNTERS
struct osd_thread_info *info = data;
LASSERT(info->oti_r_locks == 0);
LASSERT(info->oti_w_locks == 0);
LASSERT(info->oti_txns == 0);
-#endif
}
static int osd_device_init(const struct lu_env *env, struct lu_device *d,
if (result == 0) {
struct dentry *d;
- d = simple_mkdir(osd_sb(o)->s_root, "*OBJ-TEMP*", 0777, 1);
+ d = simple_mkdir(osd_sb(o)->s_root, lmi->lmi_mnt, "*OBJ-TEMP*",
+ 0777, 1);
if (!IS_ERR(d)) {
o->od_obj_area = d;
} else
spin_lock_init(&o->od_osfs_lock);
o->od_osfs_age = cfs_time_shift_64(-1000);
o->od_capa_hash = init_capa_hash();
- if (o->od_capa_hash == NULL)
+ if (o->od_capa_hash == NULL) {
+ dt_device_fini(&o->od_dt_dev);
l = ERR_PTR(-ENOMEM);
+ }
} else
l = ERR_PTR(result);
+
+ if (IS_ERR(l))
+ OBD_FREE_PTR(o);
} else
l = ERR_PTR(-ENOMEM);
return l;
struct inode *inode;
int result;
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
LASSERT(obj->oo_inode == NULL);
LASSERT(fid_is_sane(fid));
/*
result = PTR_ERR(inode);
} else if (result == -ENOENT)
result = 0;
- LASSERT(osd_invariant(obj));
+ LINVRNT(osd_invariant(obj));
RETURN(result);
}
return osd_invariant(osd_obj(l));
}
-static struct lu_object_operations osd_lu_obj_ops = {
+static const struct lu_object_operations osd_lu_obj_ops = {
.loo_object_init = osd_object_init,
.loo_object_delete = osd_object_delete,
.loo_object_release = osd_object_release,
.loo_object_invariant = osd_object_invariant
};
-static struct lu_device_operations osd_lu_ops = {
+static const struct lu_device_operations osd_lu_ops = {
.ldo_object_alloc = osd_object_alloc,
.ldo_process_config = osd_process_config,
.ldo_recovery_complete = osd_recovery_complete
};
-static struct lu_device_type_operations osd_device_type_ops = {
+static const struct lu_device_type_operations osd_device_type_ops = {
.ldto_init = osd_type_init,
.ldto_fini = osd_type_fini,
+ .ldto_start = osd_type_start,
+ .ldto_stop = osd_type_stop,
+
.ldto_device_alloc = osd_device_alloc,
.ldto_device_free = osd_device_free,