EXIT;
}
-int lustre_init_ea_size(struct ll_sb_info *sbi)
+int lustre_init_lov_desc(struct ll_sb_info *sbi)
{
- struct lov_desc desc;
- int rc, valsize;
+ int valsize, rc;
+ ENTRY;
- /* OSC may have larger ea size */
- valsize = sizeof(desc);
- rc = obd_get_info(sbi->ll_osc_exp, strlen("lovdesc") + 1, "lovdesc",
- &valsize, &desc);
- if (rc)
- RETURN(rc);
- obd_init_ea_size(sbi->ll_mdc_exp, obd_size_diskmd(sbi->ll_osc_exp, NULL),
- desc.ld_tgt_count*sizeof(struct llog_cookie));
+ valsize = sizeof(sbi->ll_lov_desc);
+ memset(&sbi->ll_lov_desc, 0, sizeof(sbi->ll_lov_desc));
+ rc = obd_get_info(sbi->ll_lov_exp, strlen("lovdesc") + 1,
+ "lovdesc", &valsize, &sbi->ll_lov_desc);
+ RETURN(rc);
+}
+int lustre_init_lmv_desc(struct ll_sb_info *sbi)
+{
+ int valsize, rc;
+ ENTRY;
+
+ valsize = sizeof(sbi->ll_lmv_desc);
+ memset(&sbi->ll_lmv_desc, 0, sizeof(sbi->ll_lmv_desc));
+ rc = obd_get_info(sbi->ll_lmv_exp, strlen("lmvdesc") + 1,
+ "lmvdesc", &valsize, &sbi->ll_lmv_desc);
RETURN(rc);
}
-int lustre_common_fill_super(struct super_block *sb, char *mdc, char *osc)
+int lustre_common_fill_super(struct super_block *sb, char *lmv, char *lov)
{
- struct inode *root = 0;
struct ll_sb_info *sbi = ll_s2sbi(sb);
+ struct ptlrpc_request *request = NULL;
+ struct lustre_handle lov_conn = {0, };
+ struct lustre_handle lmv_conn = {0, };
+ struct inode *root = NULL;
struct obd_device *obd;
- struct ll_fid rootfid;
struct obd_statfs osfs;
- struct ptlrpc_request *request = NULL;
- struct lustre_handle osc_conn = {0, };
- struct lustre_handle mdc_conn = {0, };
struct lustre_md md;
kdev_t devno;
int err;
- obd = class_name2obd(mdc);
+ obd = class_name2obd(lmv);
if (!obd) {
- CERROR("MDC %s: not setup or attached\n", mdc);
+ CERROR("MDC %s: not setup or attached\n", lmv);
RETURN(-EINVAL);
}
if (proc_lustre_fs_root) {
err = lprocfs_register_mountpoint(proc_lustre_fs_root, sb,
- osc, mdc);
+ lov, lmv);
if (err < 0)
CERROR("could not register mount in /proc/lustre");
}
- err = obd_connect(&mdc_conn, obd, &sbi->ll_sb_uuid, 0);
+ err = obd_connect(&lmv_conn, obd, &sbi->ll_sb_uuid, 0);
if (err == -EBUSY) {
CERROR("An MDS (mdc %s) is performing recovery, of which this"
" client is not a part. Please wait for recovery to "
- "complete, abort, or time out.\n", mdc);
+ "complete, abort, or time out.\n", lmv);
GOTO(out, err);
} else if (err) {
- CERROR("cannot connect to %s: rc = %d\n", mdc, err);
+ CERROR("cannot connect to %s: rc = %d\n", lmv, err);
GOTO(out, err);
}
- sbi->ll_mdc_exp = class_conn2export(&mdc_conn);
+ sbi->ll_lmv_exp = class_conn2export(&lmv_conn);
+ lustre_init_lmv_desc(sbi);
+
err = obd_statfs(obd, &osfs, jiffies - HZ);
if (err)
- GOTO(out_mdc, err);
+ GOTO(out_lmv, err);
- LASSERT(osfs.os_bsize);
+ if (!osfs.os_bsize) {
+ CERROR("Invalid block size is detected.");
+ GOTO(out_lmv, err);
+ }
+
+ sb->s_magic = LL_SUPER_MAGIC;
sb->s_blocksize = osfs.os_bsize;
sb->s_blocksize_bits = log2(osfs.os_bsize);
- sb->s_magic = LL_SUPER_MAGIC;
sb->s_maxbytes = PAGE_CACHE_MAXBYTES;
- devno = get_uuid2int(sbi->ll_mdc_exp->exp_obd->obd_uuid.uuid,
- strlen(sbi->ll_mdc_exp->exp_obd->obd_uuid.uuid));
+ devno = get_uuid2int(sbi->ll_lmv_exp->exp_obd->obd_uuid.uuid,
+ strlen(sbi->ll_lmv_exp->exp_obd->obd_uuid.uuid));
sb->s_dev = devno;
- obd = class_name2obd(osc);
+ obd = class_name2obd(lov);
if (!obd) {
- CERROR("OSC %s: not setup or attached\n", osc);
- GOTO(out_mdc, err);
+ CERROR("OSC %s: not setup or attached\n", lov);
+ GOTO(out_lmv, err);
}
- err = obd_connect(&osc_conn, obd, &sbi->ll_sb_uuid, 0);
+ err = obd_connect(&lov_conn, obd, &sbi->ll_sb_uuid, 0);
if (err == -EBUSY) {
CERROR("An OST (osc %s) is performing recovery, of which this"
" client is not a part. Please wait for recovery to "
- "complete, abort, or time out.\n", osc);
+ "complete, abort, or time out.\n", lov);
GOTO(out, err);
} else if (err) {
- CERROR("cannot connect to %s: rc = %d\n", osc, err);
- GOTO(out_mdc, err);
+ CERROR("cannot connect to %s: rc = %d\n", lov, err);
+ GOTO(out_lmv, err);
}
- sbi->ll_osc_exp = class_conn2export(&osc_conn);
-
- lustre_init_ea_size(sbi);
- err = md_getstatus(sbi->ll_mdc_exp, &rootfid);
+ sbi->ll_lov_exp = class_conn2export(&lov_conn);
+
+ err = lustre_init_lov_desc(sbi);
+ if (err == 0) {
+ int mdsize = obd_size_diskmd(sbi->ll_lov_exp, NULL);
+ obd_init_ea_size(sbi->ll_lmv_exp, mdsize,
+ sbi->ll_lov_desc.ld_tgt_count *
+ sizeof(struct llog_cookie));
+ }
+
+ err = md_getstatus(sbi->ll_lmv_exp, &sbi->ll_rootid);
if (err) {
CERROR("cannot mds_connect: rc = %d\n", err);
- GOTO(out_osc, err);
+ GOTO(out_lov, err);
}
- CDEBUG(D_SUPER, "rootfid "LPU64"\n", rootfid.id);
- sbi->ll_rootino = rootfid.id;
+ CDEBUG(D_SUPER, "rootid "DLID4"\n", OLID4(&sbi->ll_rootid));
sb->s_op = &lustre_super_operations;
/* make root inode
* XXX: move this to after cbd setup? */
- err = md_getattr(sbi->ll_mdc_exp, &rootfid,
- OBD_MD_FLNOTOBD | OBD_MD_FLBLOCKS, 0, &request);
+ err = md_getattr(sbi->ll_lmv_exp, &sbi->ll_rootid,
+ OBD_MD_FLNOTOBD | OBD_MD_FLBLOCKS | OBD_MD_FID,
+ 0, &request);
if (err) {
CERROR("md_getattr failed for root: rc = %d\n", err);
- GOTO(out_osc, err);
+ GOTO(out_lov, err);
}
- err = mdc_req2lustre_md(sbi->ll_mdc_exp, request, 0,
- sbi->ll_osc_exp, &md);
+ err = mdc_req2lustre_md(sbi->ll_lmv_exp, request, 0,
+ sbi->ll_lov_exp, &md);
if (err) {
- CERROR("failed to understand root inode md: rc = %d\n",err);
- ptlrpc_req_finished (request);
- GOTO(out_osc, err);
+ CERROR("failed to understand root inode md: rc = %d\n", err);
+ ptlrpc_req_finished(request);
+ GOTO(out_lov, err);
}
- LASSERT(sbi->ll_rootino != 0);
- root = ll_iget(sb, sbi->ll_rootino, &md);
+ LASSERT(sbi->ll_rootid.li_stc.u.e3s.l3s_ino != 0);
+ root = ll_iget(sb, sbi->ll_rootid.li_stc.u.e3s.l3s_ino, &md);
ptlrpc_req_finished(request);
if (root == NULL || is_bad_inode(root)) {
- /* XXX might need iput() for bad inode */
CERROR("lustre_lite: bad iget4 for root\n");
GOTO(out_root, err = -EBADF);
}
ll_gns_add_timer(sbi);
- /* making vm readahead 0 for 2.4.x. In the case of 2.6.x,
- backing dev info assigned to inode mapping is used for
- determining maximal readahead. */
+ /* making vm readahead 0 for 2.4.x. In the case of 2.6.x, backing dev
+ info assigned to inode mapping is used for determining maximal
+ readahead. */
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
/* bug 2805 - set VM readahead to zero */
vm_max_readahead = vm_min_readahead = 0;
out_root:
if (root)
iput(root);
-out_osc:
- obd_disconnect(sbi->ll_osc_exp, 0);
-out_mdc:
- obd_disconnect(sbi->ll_mdc_exp, 0);
+out_lov:
+ obd_disconnect(sbi->ll_lov_exp, 0);
+out_lmv:
+ obd_disconnect(sbi->ll_lmv_exp, 0);
out:
lprocfs_unregister_mountpoint(sbi);
RETURN(err);
ENTRY;
ll_gns_del_timer(sbi);
-
ll_close_thread_shutdown(sbi->ll_lcq);
list_del(&sbi->ll_conn_chain);
- obd_disconnect(sbi->ll_osc_exp, 0);
+ obd_disconnect(sbi->ll_lov_exp, 0);
lprocfs_unregister_mountpoint(sbi);
if (sbi->ll_proc_root) {
sbi->ll_proc_root = NULL;
}
- obd_disconnect(sbi->ll_mdc_exp, 0);
+ obd_disconnect(sbi->ll_lmv_exp, 0);
// We do this to get rid of orphaned dentries. That is not really trw.
spin_lock(&dcache_lock);
EXIT;
}
-
char *ll_read_opt(const char *opt, char *data)
{
char *value;
RETURN(fl);
}
-void ll_options(char *options, char **ost, char **mdc, int *flags)
+void ll_options(char *options, char **lov, char **lmv, int *flags)
{
char *this_char;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
while ((this_char = strsep (&opt_ptr, ",")) != NULL) {
#endif
CDEBUG(D_SUPER, "this_char %s\n", this_char);
- if (!*ost && (*ost = ll_read_opt("osc", this_char)))
+ if (!*lov && (*lov = ll_read_opt("osc", this_char)))
continue;
- if (!*mdc && (*mdc = ll_read_opt("mdc", this_char)))
+ if (!*lmv && (*lmv = ll_read_opt("mdc", this_char)))
continue;
if (!(*flags & LL_SBI_NOLCK) &&
((*flags) = (*flags) |
spin_lock_init(&lli->lli_lock);
INIT_LIST_HEAD(&lli->lli_pending_write_llaps);
lli->lli_inode_magic = LLI_INODE_MAGIC;
+ memset(&lli->lli_id, 0, sizeof(lli->lli_id));
}
int ll_fill_super(struct super_block *sb, void *data, int silent)
{
struct ll_sb_info *sbi;
- char *osc = NULL;
- char *mdc = NULL;
+ char *lov = NULL;
+ char *lmv = NULL;
int err;
ENTRY;
RETURN(-ENOMEM);
sbi->ll_flags |= LL_SBI_READAHEAD;
- ll_options(data, &osc, &mdc, &sbi->ll_flags);
+ ll_options(data, &lov, &lmv, &sbi->ll_flags);
- if (!osc) {
+ if (!lov) {
CERROR("no osc\n");
GOTO(out, err = -EINVAL);
}
- if (!mdc) {
+ if (!lmv) {
CERROR("no mdc\n");
GOTO(out, err = -EINVAL);
}
- err = lustre_common_fill_super(sb, mdc, osc);
+ err = lustre_common_fill_super(sb, lmv, lov);
out:
if (err)
lustre_free_sbi(sb);
- if (mdc)
- OBD_FREE(mdc, strlen(mdc) + 1);
- if (osc)
- OBD_FREE(osc, strlen(osc) + 1);
-
+ if (lmv)
+ OBD_FREE(lmv, strlen(lmv) + 1);
+ if (lov)
+ OBD_FREE(lov, strlen(lov) + 1);
RETURN(err);
} /* ll_read_super */
{
struct lustre_cfg lcfg;
struct portals_cfg pcfg;
- char * peer = "MDS_PEER_UUID";
+ char *peer = "MDS_PEER_UUID";
struct obd_device *obd;
- struct lustre_handle mdc_conn = {0, };
+ struct lustre_handle lmv_conn = {0, };
struct obd_export *exp;
- char * name = "mdc_dev";
+ char *name = "mdc_dev";
class_uuid_t uuid;
- struct obd_uuid mdc_uuid;
+ struct obd_uuid lmv_uuid;
struct llog_ctxt *ctxt;
int rc = 0;
int err;
RETURN(-EINVAL);
generate_random_uuid(uuid);
- class_uuid_unparse(uuid, &mdc_uuid);
+ class_uuid_unparse(uuid, &lmv_uuid);
if (lmd->lmd_local_nid) {
PCFG_INIT(pcfg, NAL_CMD_REGISTER_MYNID);
LCFG_INIT(lcfg, LCFG_ATTACH, name);
lcfg.lcfg_inlbuf1 = "mdc";
lcfg.lcfg_inllen1 = strlen(lcfg.lcfg_inlbuf1) + 1;
- lcfg.lcfg_inlbuf2 = mdc_uuid.uuid;
+ lcfg.lcfg_inlbuf2 = lmv_uuid.uuid;
lcfg.lcfg_inllen2 = strlen(lcfg.lcfg_inlbuf2) + 1;
err = class_process_config(&lcfg);
if (err < 0)
if (err)
GOTO(out_cleanup, err);
- err = obd_connect(&mdc_conn, obd, &mdc_uuid, 0);
+ err = obd_connect(&lmv_conn, obd, &lmv_uuid, 0);
if (err) {
CERROR("cannot connect to %s: rc = %d\n", lmd->lmd_mds, err);
GOTO(out_cleanup, err);
}
- exp = class_conn2export(&mdc_conn);
+ exp = class_conn2export(&lmv_conn);
ctxt = llog_get_context(&exp->exp_obd->obd_llogs,LLOG_CONFIG_REPL_CTXT);
rc = class_config_process_llog(ctxt, profile, cfg);
int lustre_fill_super(struct super_block *sb, void *data, int silent)
{
struct lustre_mount_data * lmd = data;
+ char *lov = NULL, *lmv = NULL;
struct ll_sb_info *sbi;
- char *osc = NULL;
- char *mdc = NULL;
int err;
ENTRY;
CERROR("No profile found: %s\n", lmd->lmd_profile);
GOTO(out_free, err = -EINVAL);
}
- if (osc)
- OBD_FREE(osc, strlen(osc) + 1);
- OBD_ALLOC(osc, strlen(lprof->lp_osc) +
+ if (lov)
+ OBD_FREE(lov, strlen(lov) + 1);
+ OBD_ALLOC(lov, strlen(lprof->lp_lov) +
strlen(sbi->ll_instance) + 2);
- sprintf(osc, "%s-%s", lprof->lp_osc, sbi->ll_instance);
+ sprintf(lov, "%s-%s", lprof->lp_lov, sbi->ll_instance);
- if (mdc)
- OBD_FREE(mdc, strlen(mdc) + 1);
- OBD_ALLOC(mdc, strlen(lprof->lp_mdc) +
+ if (lmv)
+ OBD_FREE(lmv, strlen(lmv) + 1);
+ OBD_ALLOC(lmv, strlen(lprof->lp_lmv) +
strlen(sbi->ll_instance) + 2);
- sprintf(mdc, "%s-%s", lprof->lp_mdc, sbi->ll_instance);
+ sprintf(lmv, "%s-%s", lprof->lp_lmv, sbi->ll_instance);
}
- if (!osc) {
+ if (!lov) {
CERROR("no osc\n");
GOTO(out_free, err = -EINVAL);
}
- if (!mdc) {
+ if (!lmv) {
CERROR("no mdc\n");
GOTO(out_free, err = -EINVAL);
}
- err = lustre_common_fill_super(sb, mdc, osc);
+ err = lustre_common_fill_super(sb, lmv, lov);
if (err)
GOTO(out_free, err);
out_dev:
- if (mdc)
- OBD_FREE(mdc, strlen(mdc) + 1);
- if (osc)
- OBD_FREE(osc, strlen(osc) + 1);
+ if (lmv)
+ OBD_FREE(lmv, strlen(lmv) + 1);
+ if (lov)
+ OBD_FREE(lov, strlen(lov) + 1);
RETURN(err);
ENTRY;
CDEBUG(D_VFSTRACE, "VFS Op: sb %p\n", sb);
- obd = class_exp2obd(sbi->ll_mdc_exp);
+ obd = class_exp2obd(sbi->ll_lmv_exp);
if (obd)
force_umount = obd->obd_no_recov;
obd = NULL;
int ll_process_config_update(struct ll_sb_info *sbi, int clean)
{
- struct obd_export *mdc_exp = sbi->ll_mdc_exp;
+ struct obd_export *lmv_exp = sbi->ll_lmv_exp;
struct lustre_mount_data *lmd = sbi->ll_lmd;
struct llog_ctxt *ctxt;
struct config_llog_instance cfg;
RETURN(0);
}
- rc = ldlm_cli_cancel_unused(mdc_exp->exp_obd->obd_namespace, NULL,
+ rc = ldlm_cli_cancel_unused(lmv_exp->exp_obd->obd_namespace, NULL,
LDLM_FL_CONFIG_CHANGE, NULL);
if (rc != 0)
CWARN("ldlm_cli_cancel_unused(mdc): %d\n", rc);
- rc = obd_cancel_unused(sbi->ll_osc_exp, NULL, LDLM_FL_CONFIG_CHANGE,
+ rc = obd_cancel_unused(sbi->ll_lov_exp, NULL, LDLM_FL_CONFIG_CHANGE,
NULL);
if (rc != 0)
CWARN("obd_cancel_unused(lov): %d\n", rc);
CWARN("Applying configuration log %s\n", name);
- ctxt = llog_get_context(&mdc_exp->exp_obd->obd_llogs,
+ ctxt = llog_get_context(&lmv_exp->exp_obd->obd_llogs,
LLOG_CONFIG_REPL_CTXT);
rc = class_config_process_llog(ctxt, name, &cfg);
if (rc == 0)
struct lov_desc desc;
int rc, valsize;
valsize = sizeof(desc);
- rc = obd_get_info(sbi->ll_osc_exp, strlen("lovdesc") + 1,
+ rc = obd_get_info(sbi->ll_lov_exp, strlen("lovdesc") + 1,
"lovdesc", &valsize, &desc);
- rc = obd_init_ea_size(mdc_exp,
- obd_size_diskmd(sbi->ll_osc_exp, NULL),
+ rc = obd_init_ea_size(lmv_exp,
+ obd_size_diskmd(sbi->ll_lov_exp, NULL),
(desc.ld_tgt_count *
sizeof(struct llog_cookie)));
}
void ll_clear_inode(struct inode *inode)
{
- struct ll_fid fid;
+ struct lustre_id id;
struct ll_inode_info *lli = ll_i2info(inode);
struct ll_sb_info *sbi = ll_i2sbi(inode);
ENTRY;
inode->i_generation, inode);
lli->lli_inode_magic = LLI_INODE_DEAD;
- ll_inode2fid(&fid, inode);
+ ll_inode2id(&id, inode);
+
clear_bit(LLI_F_HAVE_MDS_SIZE_LOCK, &(ll_i2info(inode)->lli_flags));
- md_change_cbdata(sbi->ll_mdc_exp, &fid, null_if_equal, inode);
+ md_change_cbdata(sbi->ll_lmv_exp, &id, null_if_equal, inode);
if (lli->lli_smd)
- obd_change_cbdata(sbi->ll_osc_exp, lli->lli_smd,
+ obd_change_cbdata(sbi->ll_lov_exp, lli->lli_smd,
null_if_equal, inode);
if (lli->lli_smd) {
- obd_free_memmd(sbi->ll_osc_exp, &lli->lli_smd);
+ obd_free_memmd(sbi->ll_lov_exp, &lli->lli_smd);
lli->lli_smd = NULL;
}
if (lli->lli_mea) {
- /* FIXME: change cbdata for mea here */
- obd_free_memmd(sbi->ll_mdc_exp,
+ obd_free_memmd(sbi->ll_lmv_exp,
(struct lov_stripe_md **) &lli->lli_mea);
lli->lli_mea = NULL;
}
* inode ourselves so we can call obdo_from_inode() always. */
if (ia_valid & (lsm ? ~(ATTR_SIZE | ATTR_FROM_OPEN | ATTR_RAW) : ~0)) {
struct lustre_md md;
- ll_prepare_mdc_op_data(&op_data, inode, NULL, NULL, 0, 0);
+ ll_prepare_mdc_data(&op_data, inode, NULL, NULL, 0, 0);
- rc = md_setattr(sbi->ll_mdc_exp, &op_data,
+ rc = md_setattr(sbi->ll_lmv_exp, &op_data,
attr, NULL, 0, NULL, 0, &request);
if (rc) {
ptlrpc_req_finished(request);
RETURN(rc);
}
- rc = mdc_req2lustre_md(sbi->ll_mdc_exp, request, 0,
- sbi->ll_osc_exp, &md);
+ rc = mdc_req2lustre_md(sbi->ll_lmv_exp, request, 0,
+ sbi->ll_lov_exp, &md);
if (rc) {
ptlrpc_req_finished(request);
RETURN(rc);
oa.o_valid = OBD_MD_FLID | OBD_MD_FLGROUP;
obdo_from_inode(&oa, inode, OBD_MD_FLTYPE | OBD_MD_FLATIME |
OBD_MD_FLMTIME | OBD_MD_FLCTIME);
- rc = obd_setattr(sbi->ll_osc_exp, &oa, lsm, NULL);
+ rc = obd_setattr(sbi->ll_lov_exp, &oa, lsm, NULL);
if (rc)
CERROR("obd_setattr fails: rc=%d\n", rc);
}
int rc;
ENTRY;
- rc = obd_statfs(class_exp2obd(sbi->ll_mdc_exp), osfs, max_age);
+ rc = obd_statfs(class_exp2obd(sbi->ll_lmv_exp), osfs, max_age);
if (rc) {
CERROR("mdc_statfs fails: rc = %d\n", rc);
RETURN(rc);
CDEBUG(D_SUPER, "MDC blocks "LPU64"/"LPU64" objects "LPU64"/"LPU64"\n",
osfs->os_bavail, osfs->os_blocks, osfs->os_ffree,osfs->os_files);
- rc = obd_statfs(class_exp2obd(sbi->ll_osc_exp), &obd_osfs, max_age);
+ rc = obd_statfs(class_exp2obd(sbi->ll_lov_exp), &obd_osfs, max_age);
if (rc) {
CERROR("obd_statfs fails: rc = %d\n", rc);
RETURN(rc);
void ll_update_inode(struct inode *inode, struct lustre_md *md)
{
+ struct ll_sb_info *sbi = ll_s2sbi(inode->i_sb);
struct ll_inode_info *lli = ll_i2info(inode);
- struct mds_body *body = md->body;
struct lov_stripe_md *lsm = md->lsm;
+ struct mds_body *body = md->body;
struct mea *mea = md->mea;
ENTRY;
}
}
if (lli->lli_mea != mea)
- obd_free_memmd(ll_i2mdcexp(inode),
- (struct lov_stripe_md **) &mea);
-
+ obd_free_memmd(ll_i2lmvexp(inode),
+ (struct lov_stripe_md **) &mea);
}
+ /*
+ * updating inode lustre id. We try optimize things a little bit here,
+ * thus do not do it all the time.
+ */
+ if (body->valid & OBD_MD_FID) {
+ LASSERT(id_fid(&body->id1) != 0);
+ id_assign_fid(&lli->lli_id, &body->id1);
+ }
+
+ if ((body->valid & OBD_MD_FLID) || (body->valid & OBD_MD_FLGENER))
+ id_assign_stc(&lli->lli_id, &body->id1);
+
if (body->valid & OBD_MD_FLID)
- inode->i_ino = body->ino;
+ inode->i_ino = id_ino(&body->id1);
+ if (body->valid & OBD_MD_FLGENER)
+ inode->i_generation = id_gen(&body->id1);
if (body->valid & OBD_MD_FLATIME)
LTIME_S(inode->i_atime) = body->atime;
if (body->valid & OBD_MD_FLMTIME &&
if (body->valid & OBD_MD_FLCTIME &&
body->ctime > LTIME_S(inode->i_ctime))
LTIME_S(inode->i_ctime) = body->ctime;
- if (body->valid & OBD_MD_FLMODE)
- inode->i_mode = (inode->i_mode & S_IFMT)|(body->mode & ~S_IFMT);
- if (body->valid & OBD_MD_FLTYPE)
- inode->i_mode = (inode->i_mode & ~S_IFMT)|(body->mode & S_IFMT);
+ if (body->valid & OBD_MD_FLMODE) {
+ inode->i_mode = (inode->i_mode & S_IFMT) |
+ (body->mode & ~S_IFMT);
+ }
+ if (body->valid & OBD_MD_FLTYPE) {
+ inode->i_mode = (inode->i_mode & ~S_IFMT) |
+ (body->mode & S_IFMT);
+ }
if (body->valid & OBD_MD_FLUID)
inode->i_uid = body->uid;
if (body->valid & OBD_MD_FLGID)
inode->i_flags = body->flags;
if (body->valid & OBD_MD_FLNLINK)
inode->i_nlink = body->nlink;
- if (body->valid & OBD_MD_FLGENER)
- inode->i_generation = body->generation;
if (body->valid & OBD_MD_FLRDEV)
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
inode->i_rdev = body->rdev;
if (body->valid & OBD_MD_FLSIZE)
set_bit(LLI_F_HAVE_MDS_SIZE_LOCK, &lli->lli_flags);
-
- lli->lli_mds = body->mds;
+
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
- inode->i_dev = (kdev_t) body->mds;
+ inode->i_dev = (kdev_t)id_group(&lli->lli_id);
#endif
- LASSERT(body->mds < 1000);
+ LASSERT(!sbi->ll_lmv_desc.ld_tgt_count ||
+ id_group(&lli->lli_id) < sbi->ll_lmv_desc.ld_tgt_count);
}
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
void ll_delete_inode(struct inode *inode)
{
int rc;
- struct ll_fid fid;
+ struct lustre_id id;
struct ll_sb_info *sbi = ll_i2sbi(inode);
ENTRY;
- ll_inode2fid(&fid, inode);
+ ll_inode2id(&id, inode);
- rc = md_delete_object(sbi->ll_mdc_exp, &fid);
+ rc = md_delete_object(sbi->ll_lmv_exp, &id);
if (rc) {
CERROR("md_delete_object() failed, error %d.\n",
rc);
switch(cmd) {
case EXT3_IOC_GETFLAGS: {
- struct ll_fid fid;
+ struct lustre_id id;
unsigned long valid = OBD_MD_FLFLAGS;
struct mds_body *body;
- ll_inode2fid(&fid, inode);
- rc = md_getattr(sbi->ll_mdc_exp, &fid, valid, 0, &req);
+ ll_inode2id(&id, inode);
+ rc = md_getattr(sbi->ll_lmv_exp, &id, valid, 0, &req);
if (rc) {
CERROR("failure %d inode %lu\n", rc, inode->i_ino);
RETURN(-abs(rc));
if (!oa)
RETURN(-ENOMEM);
- ll_prepare_mdc_op_data(&op_data, inode, NULL, NULL, 0, 0);
+ ll_prepare_mdc_data(&op_data, inode, NULL, NULL, 0, 0);
memset(&attr, 0x0, sizeof(attr));
attr.ia_attr_flags = flags;
attr.ia_valid |= ATTR_ATTR_FLAG;
- rc = md_setattr(sbi->ll_mdc_exp, &op_data,
+ rc = md_setattr(sbi->ll_lmv_exp, &op_data,
&attr, NULL, 0, NULL, 0, &req);
if (rc) {
ptlrpc_req_finished(req);
oa->o_flags = flags;
oa->o_valid = OBD_MD_FLID | OBD_MD_FLFLAGS | OBD_MD_FLGROUP;
- rc = obd_setattr(sbi->ll_osc_exp, oa, lsm, NULL);
+ rc = obd_setattr(sbi->ll_lov_exp, oa, lsm, NULL);
obdo_free(oa);
if (rc) {
if (rc != -EPERM && rc != -EACCES)
RETURN(0);
}
+/* this is only called in the case of forced umount. */
void ll_umount_begin(struct super_block *sb)
{
struct ll_sb_info *sbi = ll_s2sbi(sb);
CDEBUG(D_VFSTRACE, "VFS Op: superblock %p count %d active %d\n", sb,
sb->s_count, atomic_read(&sb->s_active));
- obd = class_exp2obd(sbi->ll_mdc_exp);
+ obd = class_exp2obd(sbi->ll_lmv_exp);
if (obd == NULL) {
CERROR("Invalid MDC connection handle "LPX64"\n",
- sbi->ll_mdc_exp->exp_handle.h_cookie);
+ sbi->ll_lmv_exp->exp_handle.h_cookie);
EXIT;
return;
}
obd->obd_no_recov = 1;
- obd_iocontrol(IOC_OSC_SET_ACTIVE, sbi->ll_mdc_exp, sizeof ioc_data,
- &ioc_data, NULL);
+ obd_iocontrol(IOC_OSC_SET_ACTIVE, sbi->ll_lmv_exp,
+ sizeof(ioc_data), &ioc_data, NULL);
- obd = class_exp2obd(sbi->ll_osc_exp);
+ obd = class_exp2obd(sbi->ll_lov_exp);
if (obd == NULL) {
CERROR("Invalid LOV connection handle "LPX64"\n",
- sbi->ll_osc_exp->exp_handle.h_cookie);
+ sbi->ll_lov_exp->exp_handle.h_cookie);
EXIT;
return;
}
obd->obd_no_recov = 1;
- obd_iocontrol(IOC_OSC_SET_ACTIVE, sbi->ll_osc_exp, sizeof ioc_data,
- &ioc_data, NULL);
+ obd_iocontrol(IOC_OSC_SET_ACTIVE, sbi->ll_lov_exp,
+ sizeof(ioc_data), &ioc_data, NULL);
- /* Really, we'd like to wait until there are no requests outstanding,
+ /*
+ * really, we'd like to wait until there are no requests outstanding,
* and then continue. For now, we just invalidate the requests,
* schedule, and hope.
*/
EXIT;
}
-int ll_prep_inode(struct obd_export *osc_exp, struct obd_export *mdc_exp,
+int ll_prep_inode(struct obd_export *lov_exp, struct obd_export *lmv_exp,
struct inode **inode, struct ptlrpc_request *req,
int offset, struct super_block *sb)
{
struct lustre_md md;
int rc = 0;
- rc = mdc_req2lustre_md(mdc_exp, req, offset, osc_exp, &md);
+ rc = mdc_req2lustre_md(lmv_exp, req, offset, lov_exp, &md);
if (rc)
RETURN(rc);
ll_update_inode(*inode, &md);
} else {
LASSERT(sb);
- *inode = ll_iget(sb, md.body->ino, &md);
+ *inode = ll_iget(sb, id_ino(&md.body->id1), &md);
if (*inode == NULL || is_bad_inode(*inode)) {
/* free the lsm if we allocated one above */
if (md.lsm != NULL)
- obd_free_memmd(osc_exp, &md.lsm);
+ obd_free_memmd(lov_exp, &md.lsm);
if (md.mea != NULL)
- obd_free_memmd(mdc_exp,
+ obd_free_memmd(lmv_exp,
(struct lov_stripe_md**)&md.mea);
rc = -ENOMEM;
CERROR("new_inode -fatal: rc %d\n", rc);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff