valid_flags = OBD_MD_FLTYPE | OBD_MD_FLATIME;
if (cmd == OBD_BRW_WRITE) {
oa->o_valid |= OBD_MD_FLIFID;
valid_flags = OBD_MD_FLTYPE | OBD_MD_FLATIME;
if (cmd == OBD_BRW_WRITE) {
oa->o_valid |= OBD_MD_FLIFID;
-
- /* FIXME-UMKA: should be here some mds num and mds id? */
- mdc_pack_id(obdo_id(oa), inode->i_ino, 0,
- inode->i_mode, 0, 0);
+ mdc_pack_fid(obdo_fid(oa), inode->i_ino, 0, inode->i_mode);
+
- ret = obd_preprw(OBD_BRW_READ, cmobd->cache_exp, oa, 1, &ioo,
+ ret = obd_preprw(OBD_BRW_READ, cmobd->cm_cache_exp, oa, 1, &ioo,
oa_bufs, rnb, lnb, NULL);
if (ret)
GOTO(out, rc = ret);
oa_bufs, rnb, lnb, NULL);
if (ret)
GOTO(out, rc = ret);
- rc = obd_commitrw(OBD_BRW_READ, cmobd->cache_exp, oa, 1, &ioo,
+ rc = obd_commitrw(OBD_BRW_READ, cmobd->cm_cache_exp, oa, 1, &ioo,
oa_bufs, lnb, NULL, ret);
/* countdown and wake up */
oa_bufs, lnb, NULL, ret);
/* countdown and wake up */
struct ptlrpc_svc_data *data = (struct ptlrpc_svc_data *)arg;
struct ptlrpc_thread *thread = data->thread;
struct obd_device *obd = data->dev;
struct ptlrpc_svc_data *data = (struct ptlrpc_svc_data *)arg;
struct ptlrpc_thread *thread = data->thread;
struct obd_device *obd = data->dev;
SIGNAL_MASK_LOCK(current, flags);
sigfillset(¤t->blocked);
SIGNAL_MASK_LOCK(current, flags);
sigfillset(¤t->blocked);
* ptlrpc threads functions */
static int cmobd_start_thread(struct obd_device *obd, char *name)
{
* ptlrpc threads functions */
static int cmobd_start_thread(struct obd_device *obd, char *name)
{
struct l_wait_info lwi = { 0 };
struct ptlrpc_svc_data d;
struct ptlrpc_thread *thread;
struct l_wait_info lwi = { 0 };
struct ptlrpc_svc_data d;
struct ptlrpc_thread *thread;
static void cmobd_stop_thread(struct obd_device *obd,
struct ptlrpc_thread *thread)
{
static void cmobd_stop_thread(struct obd_device *obd,
struct ptlrpc_thread *thread)
{
struct list_head *pos, *n;
struct cmobd_extent_info *ei;
ENTRY;
cmobd_stop_all_threads(obd);
struct list_head *pos, *n;
struct cmobd_extent_info *ei;
ENTRY;
cmobd_stop_all_threads(obd);
ei = list_entry(pos, struct cmobd_extent_info, ei_link);
list_del_init(&ei->ei_link);
OBD_FREE(ei, sizeof(*ei));
}
ei = list_entry(pos, struct cmobd_extent_info, ei_link);
list_del_init(&ei->ei_link);
OBD_FREE(ei, sizeof(*ei));
}
- OBD_ALLOC(cmobd->write_srv, sizeof(*cmobd->write_srv));
- if (cmobd->write_srv == NULL)
+ OBD_ALLOC(cmobd->cm_write_srv, sizeof(*cmobd->cm_write_srv));
+ if (cmobd->cm_write_srv == NULL)
static void cmobd_queue_extent(struct obd_device *obd,
struct cmobd_extent_info *ex)
{
static void cmobd_queue_extent(struct obd_device *obd,
struct cmobd_extent_info *ex)
{
- de = obd_lvfs_id2dentry(exp, id, 0, grp);
+ de = obd_lvfs_fid2dentry(exp, id, 0, grp);
struct lov_stripe_md *lsm = NULL;
struct cmobd_extent_set set;
struct cmobd_extent_info *ex;
struct lov_stripe_md *lsm = NULL;
struct cmobd_extent_set set;
struct cmobd_extent_info *ex;
set.es_ext_sz = CMOBD_MAX_EXTENT_SZ;
set.es_count = 0;
memcpy(&set.es_oa, oa, sizeof(*oa));
set.es_ext_sz = CMOBD_MAX_EXTENT_SZ;
set.es_count = 0;
memcpy(&set.es_oa, oa, sizeof(*oa));
set.es_extent.start -= set.es_extent.start & ~PAGE_MASK;
/* if the end of extent is EOF, set it as file size */
if (set.es_extent.end == OBD_OBJECT_EOF) {
set.es_extent.start -= set.es_extent.start & ~PAGE_MASK;
/* if the end of extent is EOF, set it as file size */
if (set.es_extent.end == OBD_OBJECT_EOF) {
- set.es_extent.end = cmobd_id2size(cmobd->cache_exp,
- oa->o_id, oa->o_gr) - 1;
+ set.es_extent.end = cmobd_fid2size(cmobd->cm_cache_exp,
+ oa->o_id, oa->o_gr) - 1;