-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2013, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
struct intnl_stat *st = llu_i2stat(inode);
mode_t mode = st->st_mode;
- if (current->fsuid == st->st_uid)
- mode >>= 6;
- else if (cfs_curproc_is_in_groups(st->st_gid))
- mode >>= 3;
+ if (current->fsuid == st->st_uid)
+ mode >>= 6;
+ else if (in_group_p(st->st_gid))
+ mode >>= 3;
if ((mode & mask & (MAY_READ|MAY_WRITE|MAY_EXEC)) == mask)
return 0;
ldlm_policy_data_t policy = { .l_inodebits = {bits}};
struct lu_fid *fid;
ldlm_mode_t rc;
- int flags;
+ __u64 flags;
ENTRY;
fid = &llu_i2info(inode)->lli_fid;
st->st_mode = (st->st_mode & ~S_IFMT)|(body->mode & S_IFMT);
if (lsm != NULL) {
- if (lli->lli_smd == NULL) {
- cl_inode_init(inode, md);
- lli->lli_smd = lsm;
- lli->lli_maxbytes = lsm->lsm_maxbytes;
- if (lli->lli_maxbytes > PAGE_CACHE_MAXBYTES)
- lli->lli_maxbytes = PAGE_CACHE_MAXBYTES;
- } else {
- if (lov_stripe_md_cmp(lli->lli_smd, lsm)) {
- CERROR("lsm mismatch for inode %lld\n",
- (long long)st->st_ino);
- LBUG();
- }
- }
+ if (!lli->lli_has_smd) {
+ cl_file_inode_init(inode, md);
+ lli->lli_has_smd = true;
+ lli->lli_maxbytes = lsm->lsm_maxbytes;
+ if (lli->lli_maxbytes > MAX_LFS_FILESIZE)
+ lli->lli_maxbytes = MAX_LFS_FILESIZE;
+ }
+ if (md->lsm != NULL)
+ obd_free_memmd(llu_i2obdexp(inode), &md->lsm);
}
if (body->valid & OBD_MD_FLATIME) {
lli->lli_st_flags = body->flags;
if (body->valid & OBD_MD_FLSIZE) {
if ((llu_i2sbi(inode)->ll_lco.lco_flags & OBD_CONNECT_SOM) &&
- S_ISREG(st->st_mode) && lli->lli_smd) {
+ S_ISREG(st->st_mode) && lli->lli_has_smd) {
struct lustre_handle lockh;
ldlm_mode_t mode;
valid &= src->o_valid;
- LASSERTF(!(valid & (OBD_MD_FLTYPE | OBD_MD_FLGENER | OBD_MD_FLFID |
- OBD_MD_FLID | OBD_MD_FLGROUP)),
- "object "LPU64"/"LPU64", valid %x\n",
- src->o_id, src->o_seq, valid);
+ LASSERTF(!(valid & (OBD_MD_FLTYPE | OBD_MD_FLGENER | OBD_MD_FLFID |
+ OBD_MD_FLID | OBD_MD_FLGROUP)),
+ "object "DOSTID", valid %x\n", POSTID(&src->o_oi), valid);
if (valid & (OBD_MD_FLCTIME | OBD_MD_FLMTIME))
CDEBUG(D_INODE,"valid "LPX64", cur time "CFS_TIME_T"/"CFS_TIME_T
int llu_inode_getattr(struct inode *inode, struct obdo *obdo,
__u64 ioepoch, int sync)
{
- struct llu_inode_info *lli = llu_i2info(inode);
- struct ptlrpc_request_set *set;
- struct lov_stripe_md *lsm = lli->lli_smd;
- struct obd_info oinfo = { { { 0 } } };
- int rc;
- ENTRY;
+ struct ptlrpc_request_set *set;
+ struct lov_stripe_md *lsm = NULL;
+ struct obd_info oinfo = { { { 0 } } };
+ int rc;
+ ENTRY;
+ lsm = ccc_inode_lsm_get(inode);
LASSERT(lsm);
oinfo.oi_md = lsm;
oinfo.oi_oa = obdo;
- oinfo.oi_oa->o_id = lsm->lsm_object_id;
- oinfo.oi_oa->o_seq = lsm->lsm_object_seq;
+ oinfo.oi_oa->o_oi = lsm->lsm_oi;
oinfo.oi_oa->o_mode = S_IFREG;
oinfo.oi_oa->o_ioepoch = ioepoch;
oinfo.oi_oa->o_valid = OBD_MD_FLID | OBD_MD_FLTYPE |
OBD_MD_FLBLKSZ | OBD_MD_FLMTIME |
OBD_MD_FLCTIME | OBD_MD_FLGROUP |
OBD_MD_FLATIME | OBD_MD_FLEPOCH;
- obdo_from_inode(oinfo.oi_oa, NULL, &llu_i2info(inode)->lli_fid, 0);
+ obdo_set_parent_fid(oinfo.oi_oa, &llu_i2info(inode)->lli_fid);
if (sync) {
oinfo.oi_oa->o_valid |= OBD_MD_FLFLAGS;
oinfo.oi_oa->o_flags |= OBD_FL_SRVLOCK;
rc = ptlrpc_set_wait(set);
ptlrpc_set_destroy(set);
}
+ ccc_inode_lsm_put(inode, lsm);
if (rc)
RETURN(rc);
OBD_MD_FLMTIME | OBD_MD_FLCTIME |
OBD_MD_FLSIZE;
- obdo_refresh_inode(inode, oinfo.oi_oa, oinfo.oi_oa->o_valid);
- CDEBUG(D_INODE, "objid "LPX64" size %Lu, blocks %Lu, "
- "blksize %Lu\n", lli->lli_smd->lsm_object_id,
- (long long unsigned)llu_i2stat(inode)->st_size,
- (long long unsigned)llu_i2stat(inode)->st_blocks,
- (long long unsigned)llu_i2stat(inode)->st_blksize);
- RETURN(0);
+ obdo_refresh_inode(inode, oinfo.oi_oa, oinfo.oi_oa->o_valid);
+ CDEBUG(D_INODE, "objid "DOSTID" size %llu, blocks %llu, "
+ "blksize %llu\n", POSTID(&oinfo.oi_oa->o_oi),
+ (long long unsigned)llu_i2stat(inode)->st_size,
+ (long long unsigned)llu_i2stat(inode)->st_blocks,
+ (long long unsigned)llu_i2stat(inode)->st_blksize);
+ RETURN(0);
}
static struct inode* llu_new_inode(struct filesys *fs,
/* initialize lli here */
lli->lli_sbi = llu_fs2sbi(fs);
- lli->lli_smd = NULL;
+ lli->lli_has_smd = false;
lli->lli_symlink_name = NULL;
lli->lli_flags = 0;
lli->lli_maxbytes = (__u64)(~0UL);
struct lustre_handle lockh;
ldlm_policy_data_t policy = { .l_inodebits = { lockpart } };
struct lu_fid *fid;
- int flags;
+ __u64 flags;
ENTRY;
LASSERT(inode);
llu_update_inode(inode, &md);
- if (md.lsm != NULL && lli->lli_smd != md.lsm)
- obd_free_memmd(sbi->ll_dt_exp, &md.lsm);
- ptlrpc_req_finished(req);
- }
+ if (md.lsm != NULL)
+ obd_free_memmd(sbi->ll_dt_exp, &md.lsm);
+ ptlrpc_req_finished(req);
+ }
- if (!lli->lli_smd) {
+ if (!lli->lli_has_smd) {
/* object not yet allocated, don't validate size */
st->st_atime = lli->lli_lvb.lvb_atime;
st->st_mtime = lli->lli_lvb.lvb_mtime;
void llu_clear_inode(struct inode *inode)
{
- struct llu_inode_info *lli = llu_i2info(inode);
- struct llu_sb_info *sbi = llu_i2sbi(inode);
+ struct llu_inode_info *lli = llu_i2info(inode);
+ struct llu_sb_info *sbi = llu_i2sbi(inode);
+ struct lov_stripe_md *lsm;
ENTRY;
CDEBUG(D_VFSTRACE, "VFS Op:inode=%llu/%lu(%p)\n",
inode);
lli->lli_flags &= ~LLIF_MDS_SIZE_LOCK;
- md_change_cbdata(sbi->ll_md_exp, ll_inode2fid(inode),
- null_if_equal, inode);
-
- if (lli->lli_smd)
- obd_change_cbdata(sbi->ll_dt_exp, lli->lli_smd,
- null_if_equal, inode);
+ md_null_inode(sbi->ll_md_exp, ll_inode2fid(inode));
- cl_inode_fini(inode);
+ lsm = ccc_inode_lsm_get(inode);
+ if (lsm != NULL)
+ obd_change_cbdata(sbi->ll_dt_exp, lsm, null_if_equal, inode);
+ ccc_inode_lsm_put(inode, lsm);
- if (lli->lli_smd) {
- obd_free_memmd(sbi->ll_dt_exp, &lli->lli_smd);
- lli->lli_smd = NULL;
- }
+ cl_inode_fini(inode);
+ lli->lli_has_smd = false;
if (lli->lli_symlink_name) {
OBD_FREE(lli->lli_symlink_name,
* inode_setattr() is only ever invoked with ATTR_SIZE (by
* llu_setattr_raw()) when file has no bodies. Check this.
*/
- LASSERT(ergo(ia_valid & ATTR_SIZE, llu_i2info(inode)->lli_smd == NULL));
+ LASSERT(ergo(ia_valid & ATTR_SIZE, !llu_i2info(inode)->lli_has_smd));
if (ia_valid & ATTR_SIZE)
st->st_size = attr->ia_size;
st->st_mtime = attr->ia_mtime;
if (ia_valid & ATTR_CTIME)
st->st_ctime = attr->ia_ctime;
- if (ia_valid & ATTR_MODE) {
- st->st_mode = attr->ia_mode;
- if (!cfs_curproc_is_in_groups(st->st_gid) &&
- !cfs_capable(CFS_CAP_FSETID))
- st->st_mode &= ~S_ISGID;
- }
+ if (ia_valid & ATTR_MODE) {
+ st->st_mode = attr->ia_mode;
+ if (!in_group_p(st->st_gid) &&
+ !cfs_capable(CFS_CAP_FSETID))
+ st->st_mode &= ~S_ISGID;
+ }
/* mark_inode_dirty(inode); */
return error;
}
*/
int llu_setattr_raw(struct inode *inode, struct iattr *attr)
{
- struct lov_stripe_md *lsm = llu_i2info(inode)->lli_smd;
+ int has_lsm = llu_i2info(inode)->lli_has_smd;
struct intnl_stat *st = llu_i2stat(inode);
int ia_valid = attr->ia_valid;
struct md_op_data op_data = { { 0 } };
if (attr->ia_valid & (ATTR_MTIME | ATTR_CTIME))
CDEBUG(D_INODE, "setting mtime "CFS_TIME_T", ctime "CFS_TIME_T
", now = "CFS_TIME_T"\n",
- LTIME_S(attr->ia_mtime), LTIME_S(attr->ia_ctime),
- LTIME_S(CFS_CURRENT_TIME));
-
- /* NB: ATTR_SIZE will only be set after this point if the size
- * resides on the MDS, ie, this file has no objects. */
- if (lsm)
- attr->ia_valid &= ~ATTR_SIZE;
-
- /* If only OST attributes being set on objects, don't do MDS RPC.
- * In that case, we need to check permissions and update the local
- * inode ourselves so we can call obdo_from_inode() always. */
- if (ia_valid & (lsm ? ~(ATTR_FROM_OPEN | ATTR_RAW) : ~0)) {
+ LTIME_S(attr->ia_mtime), LTIME_S(attr->ia_ctime),
+ LTIME_S(CFS_CURRENT_TIME));
+
+ /* NB: ATTR_SIZE will only be set after this point if the size
+ * resides on the MDS, ie, this file has no objects. */
+ if (has_lsm)
+ attr->ia_valid &= ~ATTR_SIZE;
+
+ /* If only OST attributes being set on objects, don't do MDS RPC.
+ * In that case, we need to check permissions and update the local
+ * inode ourselves so we can call obdo_from_inode() always. */
+ if (ia_valid & (has_lsm ? ~(ATTR_FROM_OPEN | ATTR_RAW) : ~0)) {
memcpy(&op_data.op_attr, attr, sizeof(*attr));
/* Open epoch for truncate. */
RETURN(rc);
llu_ioepoch_open(llu_i2info(inode), op_data.op_ioepoch);
- if (!lsm || !S_ISREG(st->st_mode)) {
+ if (!has_lsm || !S_ISREG(st->st_mode)) {
CDEBUG(D_INODE, "no lsm: not setting attrs on OST\n");
GOTO(out, rc);
}
if (ia_valid & ATTR_SIZE)
attr->ia_valid |= ATTR_SIZE;
- if ((ia_valid & ATTR_SIZE) |
- ((ia_valid | ATTR_ATIME | ATTR_ATIME_SET) &&
- LTIME_S(attr->ia_atime) < LTIME_S(attr->ia_ctime)) ||
- ((ia_valid | ATTR_MTIME | ATTR_MTIME_SET) &&
- LTIME_S(attr->ia_mtime) < LTIME_S(attr->ia_ctime)))
- /* perform truncate and setting mtime/atime to past under PW
- * 0:EOF extent lock (new_size:EOF for truncate) */
+ if (ia_valid & (ATTR_SIZE |
+ ATTR_ATIME | ATTR_ATIME_SET |
+ ATTR_MTIME | ATTR_MTIME_SET))
+ /* on truncate and utimes send attributes to osts, setting
+ * mtime/atime to past will be performed under PW 0:EOF extent
+ * lock (new_size:EOF for truncate)
+ * it may seem excessive to send mtime/atime updates to osts
+ * when not setting times to past, but it is necessary due to
+ * possible time de-synchronization */
rc = cl_setattr_ost(inode, attr, NULL);
EXIT;
out:
int rc;
ENTRY;
- rc = obd_statfs(class_exp2obd(sbi->ll_md_exp), osfs, max_age, 0);
+ rc = obd_statfs(NULL, sbi->ll_md_exp, osfs, max_age, 0);
if (rc) {
CERROR("md_statfs fails: rc = %d\n", rc);
RETURN(rc);
/* For now we will always get up-to-date statfs values, but in the
* future we may allow some amount of caching on the client (e.g.
* from QOS or lprocfs updates). */
- rc = llu_statfs_internal(sbi, &osfs, cfs_time_current_64() - CFS_HZ);
+ rc = llu_statfs_internal(sbi, &osfs,
+ cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS));
if (rc)
return rc;
int cmd,
struct file_lock *file_lock)
{
- struct llu_inode_info *lli = llu_i2info(ino);
- struct intnl_stat *st = llu_i2stat(ino);
- struct ldlm_res_id res_id =
- { .name = {fid_seq(&lli->lli_fid),
- fid_oid(&lli->lli_fid),
- fid_ver(&lli->lli_fid),
- LDLM_FLOCK} };
- struct ldlm_enqueue_info einfo = { LDLM_FLOCK, 0, NULL,
- ldlm_flock_completion_ast, NULL, NULL, file_lock };
-
- struct lustre_handle lockh = {0};
- ldlm_policy_data_t flock;
- int flags = 0;
- int rc;
+ struct llu_inode_info *lli = llu_i2info(ino);
+ struct ldlm_res_id res_id =
+ { .name = {fid_seq(&lli->lli_fid),
+ fid_oid(&lli->lli_fid),
+ fid_ver(&lli->lli_fid),
+ LDLM_FLOCK} };
+ struct ldlm_enqueue_info einfo = {
+ .ei_type = LDLM_FLOCK,
+ .ei_mode = 0,
+ .ei_cb_cp = ldlm_flock_completion_ast,
+ .ei_cbdata = file_lock,
+ };
+ struct intnl_stat *st = llu_i2stat(ino);
+ struct lustre_handle lockh = {0};
+ ldlm_policy_data_t flock;
+ __u64 flags = 0;
+ int rc;
CDEBUG(D_VFSTRACE, "VFS Op:inode=%llu file_lock=%p\n",
(unsigned long long)st->st_ino, file_lock);
LBUG();
}
- CDEBUG(D_DLMTRACE, "inode=%llu, pid=%u, cmd=%d, flags=%#x, mode=%u, "
+ CDEBUG(D_DLMTRACE, "inode=%llu, pid=%u, cmd=%d, flags=%#llx, mode=%u, "
"start="LPX64", end="LPX64"\n", (unsigned long long)st->st_ino,
flock.l_flock.pid, cmd, flags, einfo.ei_mode, flock.l_flock.start,
flock.l_flock.end);
if (lmv->desc.ld_tgt_count < 1)
RETURN(rc = -ENODEV);
- if (lmv->tgts[0].ltd_exp != NULL)
- rc = ldlm_cli_enqueue(lmv->tgts[0].ltd_exp, NULL, &einfo, &res_id,
- &flock, &flags, NULL, 0, &lockh, 0);
- else
- rc = -ENODEV;
+ if (lmv->tgts[0] != NULL && lmv->tgts[0]->ltd_exp != NULL)
+ rc = ldlm_cli_enqueue(lmv->tgts[0]->ltd_exp, NULL,
+ &einfo, &res_id, &flock, &flags,
+ NULL, 0, LVB_T_NONE, &lockh, 0);
+ else
+ rc = -ENODEV;
}
RETURN(rc);
}
LASSERT(sizeof(lum) == sizeof(*lump));
LASSERT(sizeof(lum.lmm_objects[0]) ==
sizeof(lump->lmm_objects[0]));
- if (cfs_copy_from_user(&lum, lump, sizeof(lum)))
+ if (copy_from_user(&lum, lump, sizeof(lum)))
return(-EFAULT);
switch (lum.lmm_magic) {
}
static int llu_lov_setstripe_ea_info(struct inode *ino, int flags,
- struct lov_user_md *lum, int lum_size)
+ struct lov_user_md *lum, int lum_size)
{
- struct llu_sb_info *sbi = llu_i2sbi(ino);
- struct llu_inode_info *lli = llu_i2info(ino);
- struct lookup_intent oit = {.it_op = IT_OPEN, .it_flags = flags};
- struct ldlm_enqueue_info einfo = { LDLM_IBITS, LCK_CR,
- llu_md_blocking_ast, ldlm_completion_ast, NULL, NULL, NULL };
- struct ptlrpc_request *req = NULL;
- struct lustre_md md;
- struct md_op_data data = {{ 0 }};
- struct lustre_handle lockh;
- int rc = 0;
- ENTRY;
-
- if (lli->lli_smd) {
- CDEBUG(D_IOCTL, "stripe already exists for ino "DFID"\n",
- PFID(&lli->lli_fid));
- return -EEXIST;
- }
+ struct llu_sb_info *sbi = llu_i2sbi(ino);
+ struct llu_inode_info *lli = llu_i2info(ino);
+ struct lookup_intent oit = {.it_op = IT_OPEN, .it_flags = flags};
+ struct ldlm_enqueue_info einfo = {
+ .ei_type = LDLM_IBITS,
+ .ei_mode = LCK_CR,
+ .ei_cb_bl = llu_md_blocking_ast,
+ .ei_cb_cp = ldlm_completion_ast,
+ };
+ struct ptlrpc_request *req = NULL;
+ struct lustre_md md;
+ struct md_op_data data = {{ 0 }};
+ struct lustre_handle lockh;
+ int rc = 0;
+ ENTRY;
+
+ if (lli->lli_has_smd) {
+ CDEBUG(D_IOCTL, "stripe already exists for ino "DFID"\n",
+ PFID(&lli->lli_fid));
+ return -EEXIST;
+ }
llu_prep_md_op_data(&data, NULL, ino, NULL, 0, O_RDWR,
LUSTRE_OPC_ANY);
LASSERT(sizeof(lum) == sizeof(*lump));
LASSERT(sizeof(lum.lmm_objects[0]) == sizeof(lump->lmm_objects[0]));
- if (cfs_copy_from_user(&lum, lump, sizeof(lum)))
+ if (copy_from_user(&lum, lump, sizeof(lum)))
RETURN(-EFAULT);
rc = llu_lov_setstripe_ea_info(ino, flags, &lum, sizeof(lum));
static int llu_lov_getstripe(struct inode *ino, unsigned long arg)
{
- struct lov_stripe_md *lsm = llu_i2info(ino)->lli_smd;
-
- if (!lsm)
- RETURN(-ENODATA);
-
- return obd_iocontrol(LL_IOC_LOV_GETSTRIPE, llu_i2obdexp(ino), 0, lsm,
- (void *)arg);
+ struct lov_stripe_md *lsm = NULL;
+ int rc = -ENODATA;
+
+ lsm = ccc_inode_lsm_get(ino);
+ if (lsm != NULL)
+ rc = obd_iocontrol(LL_IOC_LOV_GETSTRIPE, llu_i2obdexp(ino), 0, lsm,
+ (void *)arg);
+ ccc_inode_lsm_put(ino, lsm);
+ return rc;
}
static int llu_iop_ioctl(struct inode *ino, unsigned long int request,
struct lustre_md md;
class_uuid_t uuid;
struct config_llog_instance cfg = {0, };
- char ll_instance[sizeof(sbi) * 2 + 1];
struct lustre_profile *lprof;
char *zconf_mgsnid, *zconf_profile;
char *osc = NULL, *mdc = NULL;
int async = 1, err = -EINVAL;
struct obd_connect_data ocd = {0,};
struct md_op_data op_data = {{0}};
+ /* %p for void* in printf needs 16+2 characters: 0xffffffffffffffff */
+ const int instlen = sizeof(cfg.cfg_instance) * 2 + 2;
ENTRY;
/* generate a string unique to this super, let's try
the address of the super itself.*/
- sprintf(ll_instance, "%p", sbi);
+ cfg.cfg_instance = sbi;
/* retrive & parse config log */
- cfg.cfg_instance = ll_instance;
cfg.cfg_uuid = sbi->ll_sb_uuid;
err = liblustre_process_log(&cfg, zconf_mgsnid, zconf_profile, 1);
if (err < 0) {
CERROR("No profile found: %s\n", zconf_profile);
GOTO(out_free, err = -EINVAL);
}
- OBD_ALLOC(osc, strlen(lprof->lp_dt) + strlen(ll_instance) + 2);
- sprintf(osc, "%s-%s", lprof->lp_dt, ll_instance);
+ OBD_ALLOC(osc, strlen(lprof->lp_dt) + instlen + 2);
+ sprintf(osc, "%s-%p", lprof->lp_dt, cfg.cfg_instance);
- OBD_ALLOC(mdc, strlen(lprof->lp_md) + strlen(ll_instance) + 2);
- sprintf(mdc, "%s-%s", lprof->lp_md, ll_instance);
+ OBD_ALLOC(mdc, strlen(lprof->lp_md) + instlen + 2);
+ sprintf(mdc, "%s-%p", lprof->lp_md, cfg.cfg_instance);
if (!osc) {
CERROR("no osc\n");
CERROR("MDC %s: not setup or attached\n", mdc);
GOTO(out_free, err = -EINVAL);
}
- obd_set_info_async(obd->obd_self_export, sizeof(KEY_ASYNC), KEY_ASYNC,
- sizeof(async), &async, NULL);
+ obd_set_info_async(NULL, obd->obd_self_export, sizeof(KEY_ASYNC),
+ KEY_ASYNC, sizeof(async), &async, NULL);
ocd.ocd_connect_flags = OBD_CONNECT_IBITS | OBD_CONNECT_VERSION |
OBD_CONNECT_FID | OBD_CONNECT_AT |
- OBD_CONNECT_VBR | OBD_CONNECT_FULL20;
+ OBD_CONNECT_VBR | OBD_CONNECT_FULL20 |
+ OBD_CONNECT_LVB_TYPE;
#ifdef LIBLUSTRE_POSIX_ACL
ocd.ocd_connect_flags |= OBD_CONNECT_ACL;
GOTO(out_free, err);
}
- err = obd_statfs(obd, &osfs, 100000000, 0);
+ err = obd_statfs(NULL, sbi->ll_md_exp, &osfs, 100000000, 0);
if (err)
GOTO(out_md, err);
CERROR("OSC %s: not setup or attached\n", osc);
GOTO(out_md, err = -EINVAL);
}
- obd_set_info_async(obd->obd_self_export, sizeof(KEY_ASYNC), KEY_ASYNC,
- sizeof(async), &async, NULL);
+ obd_set_info_async(NULL, obd->obd_self_export, sizeof(KEY_ASYNC),
+ KEY_ASYNC, sizeof(async), &async, NULL);
obd->obd_upcall.onu_owner = &sbi->ll_lco;
obd->obd_upcall.onu_upcall = cl_ocd_update;
ocd.ocd_connect_flags = OBD_CONNECT_SRVLOCK | OBD_CONNECT_REQPORTAL |
OBD_CONNECT_VERSION | OBD_CONNECT_TRUNCLOCK |
OBD_CONNECT_FID | OBD_CONNECT_AT |
- OBD_CONNECT_FULL20;
+ OBD_CONNECT_FULL20 | OBD_CONNECT_EINPROGRESS |
+ OBD_CONNECT_LVB_TYPE;
ocd.ocd_version = LUSTRE_VERSION_CODE;
err = obd_connect(NULL, &sbi->ll_dt_exp, obd, &sbi->ll_sb_uuid, &ocd, NULL);
ptlrpc_req_finished(request);
CDEBUG(D_SUPER, "LibLustre: %s mounted successfully!\n", source);
- liblustre_wait_idle();
-
- return 0;
+ err = 0;
+ goto out_free;
out_inode:
_sysio_i_gone(root);
obd_disconnect(sbi->ll_md_exp);
out_free:
if (osc)
- OBD_FREE(osc, strlen(osc) + 1);
+ OBD_FREE(osc, strlen(lprof->lp_dt) + instlen + 2);
if (mdc)
- OBD_FREE(mdc, strlen(mdc) + 1);
+ OBD_FREE(mdc, strlen(lprof->lp_md) + instlen + 2);
OBD_FREE(sbi, sizeof(*sbi));
liblustre_wait_idle();
return err;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff