if (IS_ERR(mds->mds_lmv_obd))
RETURN(PTR_ERR(mds->mds_lmv_obd));
- if (mds->mds_lmv_obd)
+ if (mds->mds_lmv_connected)
RETURN(0);
+ down(&mds->mds_lmv_sem);
+ if (mds->mds_lmv_connected) {
+ up(&mds->mds_lmv_sem);
+ RETURN(0);
+ }
+
mds->mds_lmv_obd = class_name2obd(lmv_name);
if (!mds->mds_lmv_obd) {
CERROR("MDS cannot locate LMV %s\n",
lmv_name);
mds->mds_lmv_obd = ERR_PTR(-ENOTCONN);
- RETURN(-ENOTCONN);
+ GOTO(err_last, rc = -ENOTCONN);
}
- rc = obd_connect(&conn, mds->mds_lmv_obd, &obd->obd_uuid);
+ rc = obd_connect(&conn, mds->mds_lmv_obd, &obd->obd_uuid, OBD_OPT_MDS_CONNECTION);
if (rc) {
CERROR("MDS cannot connect to LMV %s (%d)\n",
lmv_name, rc);
mds->mds_lmv_obd = ERR_PTR(rc);
- RETURN(rc);
+ GOTO(err_last, rc);
}
mds->mds_lmv_exp = class_conn2export(&conn);
if (mds->mds_lmv_exp == NULL)
"inter_mds", 0, NULL);
if (rc)
GOTO(err_reg, rc);
-
+
+ mds->mds_lmv_connected = 1;
+ up(&mds->mds_lmv_sem);
RETURN(0);
err_reg:
obd_disconnect(mds->mds_lmv_exp, 0);
mds->mds_lmv_exp = NULL;
mds->mds_lmv_obd = ERR_PTR(rc);
+err_last:
+ up(&mds->mds_lmv_sem);
RETURN(rc);
}
int rc = 0;
ENTRY;
+ down(&mds->mds_lmv_sem);
if (!IS_ERR(mds->mds_lmv_obd) && mds->mds_lmv_exp != NULL) {
+ LASSERT(mds->mds_lmv_connected != 0);
+ mds->mds_lmv_connected = 0;
obd_register_observer(mds->mds_lmv_obd, NULL);
/* if obd_disconnect fails (probably because the export was
mds->mds_lmv_exp = NULL;
mds->mds_lmv_obd = NULL;
}
+ up(&mds->mds_lmv_sem);
RETURN(rc);
}
if (!mds->mds_lmv_obd)
RETURN(0);
+ if (!S_ISDIR(inode->i_mode))
+ RETURN(0);
/* first calculate mea size */
*mea_size = obd_alloc_diskmd(mds->mds_lmv_exp,
if (*mea_size < 0 || *mea == NULL)
return *mea_size < 0 ? *mea_size : -EINVAL;
- down(&inode->i_sem);
- rc = fsfilt_get_md(obd, inode, *mea, *mea_size);
- up(&inode->i_sem);
+ rc = mds_get_md(obd, inode, *mea, mea_size, 1);
if (rc <= 0) {
OBD_FREE(*mea, *mea_size);
*mea = NULL;
} else
rc = 0;
-
+
RETURN(rc);
}
page = alloc_page(GFP_KERNEL);
if (page == NULL)
return -ENOMEM;
- list_add_tail(&page->list, &dirc->list);
+ list_add_tail(&page->lru, &dirc->list);
dirc->cur = page_address(page);
dirc->free = PAGE_SIZE;
return 0;
list_for_each_safe(cur, tmp, &ca->list) {
struct page *page;
- page = list_entry(cur, struct page, list);
+ page = list_entry(cur, struct page, lru);
LASSERT(page != NULL);
retrieve_generation_numbers(dc, page_address(page));
ca->brwc.pg = page;
- ca->brwc.off = 0;
+ ca->brwc.disk_offset = ca->brwc.page_offset = 0;
ca->brwc.count = PAGE_SIZE;
ca->brwc.flag = 0;
ca->oa.o_mds = mdsnum;
ca = dc->cache + mdsnum;
list_for_each_safe(cur, tmp, &ca->list) {
- page = list_entry(cur, struct page, list);
+ page = list_entry(cur, struct page, lru);
buf = page_address(page);
end = buf + PAGE_SIZE;
continue;
list_for_each_safe(cur, tmp, &dc.cache[i].list) {
struct page *page;
- page = list_entry(cur, struct page, list);
- list_del(&page->list);
+ page = list_entry(cur, struct page, lru);
+ list_del(&page->lru);
__free_page(page);
}
}
#define MAX_DIR_SIZE (64 * 1024)
+#define I_NON_SPLITTABLE 256
+
int mds_splitting_expected(struct obd_device *obd, struct dentry *dentry)
{
struct mds_obd *mds = &obd->u.mds;
if (!S_ISDIR(dentry->d_inode->i_mode))
return MDS_NO_SPLITTABLE;
+ /* already splittied or slave directory (part of splitted dir) */
+ if (dentry->d_inode->i_flags & I_NON_SPLITTABLE)
+ return MDS_NO_SPLITTABLE;
+
/* don't split root directory */
if (dentry->d_inode->i_ino == mds->mds_rootfid.id)
return MDS_NO_SPLITTABLE;
if (mea) {
/* already splitted or slave object: shouldn't be splitted */
rc = MDS_NO_SPLITTABLE;
+ /* mark to skip subsequent checks */
+ dentry->d_inode->i_flags |= I_NON_SPLITTABLE;
} else {
/* may be splitted */
rc = MDS_EXPECT_SPLIT;
i = mds->mds_num;
} else if (mds->mds_lmv_exp) {
lmv = &mds->mds_lmv_exp->exp_obd->u.lmv;
- i = raw_name2idx(lmv->desc.ld_tgt_count, name, len);
+ i = raw_name2idx(MEA_MAGIC_LAST_CHAR, lmv->desc.ld_tgt_count, name, len);
}
RETURN(i);
}
struct dentry *dentry = NULL;
struct lvfs_run_ctxt saved;
int cleanup_phase = 0;
+ struct mds_req_sec_desc *rsd;
struct mds_body *body;
struct lvfs_ucred uc;
int rc, update_mode;
ENTRY;
+ rsd = lustre_swab_mds_secdesc(req, MDS_REQ_SECDESC_OFF);
+ if (!rsd) {
+ CERROR("Can't unpack security desc\n");
+ GOTO(cleanup, rc = -EFAULT);
+ }
+ mds_squash_root(&obd->u.mds, rsd, &req->rq_peer.peer_id.nid);
+
body = lustre_swab_reqbuf(req, offset, sizeof(*body),
lustre_swab_mds_body);
if (body == NULL) {
LASSERT(S_ISDIR(dentry->d_inode->i_mode));
- uc.luc_fsuid = body->fsuid;
- uc.luc_fsgid = body->fsgid;
- uc.luc_cap = body->capability;
- uc.luc_suppgid1 = body->suppgid;
- uc.luc_suppgid2 = -1;
+ rc = mds_init_ucred(&uc, rsd);
+ if (rc) {
+ CERROR("can't init ucred\n");
+ GOTO(cleanup, rc);
+ }
+
push_ctxt(&saved, &obd->obd_lvfs_ctxt, &uc);
rc = 0;
ldlm_lock_decref(lockh, LCK_EX);
l_dput(dentry);
pop_ctxt(&saved, &obd->obd_lvfs_ctxt, &uc);
+ mds_exit_ucred(&uc);
default:
break;
}
RETURN(rc);
}
+int mds_convert_mea_ea(struct obd_device *obd, struct inode *inode,
+ struct lov_mds_md *lmm, int lmmsize)
+{
+ int i, rc, err, size;
+ struct mea_old *old;
+ struct mea *mea;
+ struct mea *new;
+ void *handle;
+ ENTRY;
+
+ mea = (struct mea *) lmm;
+ if (mea->mea_magic == MEA_MAGIC_LAST_CHAR ||
+ mea->mea_magic == MEA_MAGIC_ALL_CHARS)
+ RETURN(0);
+
+ old = (struct mea_old *) lmm;
+ rc = sizeof(struct ll_fid) * old->mea_count + sizeof(struct mea_old);
+ if (old->mea_count > 256 || old->mea_master > 256 || lmmsize < rc
+ || old->mea_master > old->mea_count) {
+ CWARN("unknown MEA format, dont convert it\n");
+ CWARN(" count %u, master %u, size %u\n",
+ old->mea_count, old->mea_master, rc);
+ RETURN(0);
+ }
+
+ CWARN("converting MEA EA on %lu/%u from V0 to V1 (%u/%u)\n",
+ inode->i_ino, inode->i_generation, old->mea_count, old->mea_master);
+
+ size = sizeof(struct ll_fid) * old->mea_count + sizeof(struct mea);
+ OBD_ALLOC(new, size);
+ if (new == NULL)
+ RETURN(-ENOMEM);
+
+ new->mea_magic = MEA_MAGIC_LAST_CHAR;
+ new->mea_count = old->mea_count;
+ new->mea_master = old->mea_master;
+ for (i = 0; i < new->mea_count; i++)
+ new->mea_fids[i] = old->mea_fids[i];
+
+ handle = fsfilt_start(obd, inode, FSFILT_OP_SETATTR, NULL);
+ if (IS_ERR(handle)) {
+ rc = PTR_ERR(handle);
+ GOTO(conv_free, rc);
+ }
+
+ rc = fsfilt_set_md(obd, inode, handle, (struct lov_mds_md *) new, size);
+ if (rc > lmmsize)
+ size = lmmsize;
+ memcpy(lmm, new, size);
+
+ err = fsfilt_commit(obd, obd->u.mds.mds_sb, inode, handle, 0);
+ if (!rc)
+ rc = err ? err : size;
+ GOTO(conv_free, rc);
+conv_free:
+ OBD_FREE(new, size);
+ return rc;
+}
+
git://git.whamcloud.com / fs / lustre-release.git / blobdiff