X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fmgs%2Fmgs_fs.c;h=5d2b99b222584650690c1f7c85c69b978e222f66;hb=beb5686423e7a4d630ead4a3d2d4de75a3dc6e1c;hp=4c7e1ac0f15cbe86d9b3bf01dd03c8c15ed7cf88;hpb=740e445d1a7ff97b2d5bf344035e5e709f32c7d6;p=fs%2Flustre-release.git diff --git a/lustre/mgs/mgs_fs.c b/lustre/mgs/mgs_fs.c index 4c7e1ac..5d2b99b 100644 --- a/lustre/mgs/mgs_fs.c +++ b/lustre/mgs/mgs_fs.c @@ -27,7 +27,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, Whamcloud, Inc. + * Copyright (c) 2011, 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -38,63 +38,52 @@ * Lustre Management Server (MGS) filesystem interface code * * Author: Nathan Rutman + * Author: Alex Zhuravlev */ #define DEBUG_SUBSYSTEM S_MGS -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include "mgs_internal.h" int mgs_export_stats_init(struct obd_device *obd, struct obd_export *exp, - void *localdata) - + void *localdata) { - lnet_nid_t *client_nid = localdata; - int rc, newnid; - ENTRY; - - rc = lprocfs_exp_setup(exp, client_nid, &newnid); - if (rc) { - /* Mask error for already created - * /proc entries */ - if (rc == -EALREADY) - rc = 0; - RETURN(rc); - } - if (newnid) { - struct nid_stat *tmp = exp->exp_nid_stats; - int num_stats = 0; - - num_stats = (sizeof(*obd->obd_type->typ_dt_ops) / sizeof(void *)) + - LPROC_MGS_LAST - 1; - tmp->nid_stats = lprocfs_alloc_stats(num_stats, - LPROCFS_STATS_FLAG_NOPERCPU); - if (tmp->nid_stats == NULL) - return -ENOMEM; - lprocfs_init_ops_stats(LPROC_MGS_LAST, tmp->nid_stats); - mgs_stats_counter_init(tmp->nid_stats); - rc = lprocfs_register_stats(tmp->nid_proc, "stats", - tmp->nid_stats); - if (rc) - GOTO(clean, rc); - - rc = lprocfs_nid_ldlm_stats_init(tmp); - if (rc) - GOTO(clean, rc); + lnet_nid_t *client_nid = localdata; + struct nid_stat *tmp; + int rc, is_new_nid; + ENTRY; + + rc = lprocfs_exp_setup(exp, client_nid, &is_new_nid); + if (rc != 0) { + /* Mask error for already created /proc entries */ + if (rc == -EALREADY) + rc = 0; + GOTO(out, rc = 0); } - RETURN(0); -clean: - return rc; + + if (!is_new_nid) + GOTO(out, rc = 0); + + tmp = exp->exp_nid_stats; + tmp->nid_stats = lprocfs_alloc_stats(NUM_OBD_STATS + LPROC_MGS_LAST, + LPROCFS_STATS_FLAG_NOPERCPU); + if (tmp->nid_stats == NULL) + GOTO(out, rc = -ENOMEM); + + lprocfs_init_ops_stats(LPROC_MGS_LAST, tmp->nid_stats); + mgs_stats_counter_init(tmp->nid_stats); + rc = lprocfs_register_stats(tmp->nid_proc, "stats", tmp->nid_stats); + if (rc != 0) + GOTO(out, rc); + + rc = lprocfs_nid_ldlm_stats_init(tmp); + if (rc != 0) + GOTO(out, rc); + + RETURN(0); +out: + return rc; } /** @@ -114,106 +103,99 @@ int mgs_client_free(struct obd_export *exp) return 0; } -/* Same as mds_lvfs_fid2dentry */ -/* Look up an entry by inode number. */ -/* this function ONLY returns valid dget'd dentries with an initialized inode - or errors */ -static struct dentry *mgs_lvfs_fid2dentry(__u64 id, __u32 gen, - __u64 gr, void *data) +int mgs_fs_setup(const struct lu_env *env, struct mgs_device *mgs) { - struct fsfilt_fid fid; - struct obd_device *obd = (struct obd_device *)data; - ENTRY; - - CDEBUG(D_DENTRY, "--> mgs_fid2dentry: ino/gen %lu/%u, sb %p\n", - (unsigned long)id, gen, obd->u.mgs.mgs_sb); - - if (id == 0) - RETURN(ERR_PTR(-ESTALE)); - - fid.ino = id; - fid.gen = gen; - - RETURN(fsfilt_fid2dentry(obd, obd->u.mgs.mgs_vfsmnt, &fid, 0)); + struct lu_fid fid; + struct dt_object *o; + struct lu_fid rfid; + struct dt_object *root; + int rc; + + ENTRY; + + /* FIXME what's this? Do I need it? */ + rc = cfs_cleanup_group_info(); + if (rc) + RETURN(rc); + + OBD_SET_CTXT_MAGIC(&mgs->mgs_obd->obd_lvfs_ctxt); + mgs->mgs_obd->obd_lvfs_ctxt.dt = mgs->mgs_bottom; + + /* XXX: fix when support for N:1 layering is implemented */ + LASSERT(mgs->mgs_dt_dev.dd_lu_dev.ld_site); + mgs->mgs_dt_dev.dd_lu_dev.ld_site->ls_top_dev = + &mgs->mgs_dt_dev.dd_lu_dev; + + /* Setup the configs dir */ + fid.f_seq = FID_SEQ_LOCAL_NAME; + fid.f_oid = 1; + fid.f_ver = 0; + rc = local_oid_storage_init(env, mgs->mgs_bottom, &fid, &mgs->mgs_los); + if (rc) + GOTO(out, rc); + + rc = dt_root_get(env, mgs->mgs_bottom, &rfid); + if (rc) + GOTO(out_los, rc); + + root = dt_locate_at(env, mgs->mgs_bottom, &rfid, + &mgs->mgs_dt_dev.dd_lu_dev, NULL); + if (unlikely(IS_ERR(root))) + GOTO(out_los, rc = PTR_ERR(root)); + + o = local_file_find_or_create(env, mgs->mgs_los, root, + MOUNT_CONFIGS_DIR, + S_IFDIR | S_IRUGO | S_IWUSR | S_IXUGO); + if (IS_ERR(o)) + GOTO(out_root, rc = PTR_ERR(o)); + + if (!dt_try_as_dir(env, o)) { + lu_object_put(env, &o->do_lu); + GOTO(out_root, rc = -ENOTDIR); + } + + mgs->mgs_configs_dir = o; + + /* create directory to store nid table versions */ + o = local_file_find_or_create(env, mgs->mgs_los, root, MGS_NIDTBL_DIR, + S_IFDIR | S_IRUGO | S_IWUSR | S_IXUGO); + if (IS_ERR(o)) { + lu_object_put(env, &mgs->mgs_configs_dir->do_lu); + mgs->mgs_configs_dir = NULL; + GOTO(out_root, rc = PTR_ERR(o)); + } + + mgs->mgs_nidtbl_dir = o; + +out_root: + lu_object_put(env, &root->do_lu); +out_los: + if (rc) { + local_oid_storage_fini(env, mgs->mgs_los); + mgs->mgs_los = NULL; + } +out: + mgs->mgs_dt_dev.dd_lu_dev.ld_site->ls_top_dev = NULL; + + return rc; } -struct lvfs_callback_ops mgs_lvfs_ops = { - l_fid2dentry: mgs_lvfs_fid2dentry, -}; - -int mgs_fs_setup(struct obd_device *obd, struct vfsmount *mnt) +int mgs_fs_cleanup(const struct lu_env *env, struct mgs_device *mgs) { - struct mgs_device *mgs = &obd->u.mgs; - struct lvfs_run_ctxt saved; - struct dentry *dentry; - int rc; - ENTRY; - - /* FIXME what's this? Do I need it? */ - rc = cfs_cleanup_group_info(); - if (rc) - RETURN(rc); - - mgs->mgs_vfsmnt = mnt; - mgs->mgs_sb = mnt->mnt_root->d_inode->i_sb; - - rc = fsfilt_setup(obd, mgs->mgs_sb); - if (rc) - RETURN(rc); - - OBD_SET_CTXT_MAGIC(&obd->obd_lvfs_ctxt); - obd->obd_lvfs_ctxt.pwdmnt = mnt; - obd->obd_lvfs_ctxt.pwd = mnt->mnt_root; - obd->obd_lvfs_ctxt.fs = get_ds(); - obd->obd_lvfs_ctxt.cb_ops = mgs_lvfs_ops; - - push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); - - /* Setup the configs dir */ - dentry = simple_mkdir(cfs_fs_pwd(current->fs), mnt, MOUNT_CONFIGS_DIR, 0777, 1); - if (IS_ERR(dentry)) { - rc = PTR_ERR(dentry); - CERROR("cannot create %s directory: rc = %d\n", - MOUNT_CONFIGS_DIR, rc); - GOTO(err_pop, rc); - } - mgs->mgs_configs_dir = dentry; - - /* create directory to store nid table versions */ - dentry = simple_mkdir(cfs_fs_pwd(current->fs), mnt, MGS_NIDTBL_DIR, - 0777, 1); - if (IS_ERR(dentry)) { - rc = PTR_ERR(dentry); - CERROR("cannot create %s directory: rc = %d\n", - MOUNT_CONFIGS_DIR, rc); - GOTO(err_pop, rc); - } else { - dput(dentry); - } - -err_pop: - pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); - return rc; -} - -int mgs_fs_cleanup(struct obd_device *obd) -{ - struct mgs_device *mgs = &obd->u.mgs; - struct lvfs_run_ctxt saved; - int rc = 0; - - class_disconnect_exports(obd); /* cleans up client info too */ - - push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); - - if (mgs->mgs_configs_dir) { - l_dput(mgs->mgs_configs_dir); - mgs->mgs_configs_dir = NULL; - } - - shrink_dcache_sb(mgs->mgs_sb); - - pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); - - return rc; + class_disconnect_exports(mgs->mgs_obd); /* cleans up client info too */ + + if (mgs->mgs_configs_dir) { + lu_object_put(env, &mgs->mgs_configs_dir->do_lu); + mgs->mgs_configs_dir = NULL; + } + if (mgs->mgs_nidtbl_dir) { + lu_object_put(env, &mgs->mgs_nidtbl_dir->do_lu); + mgs->mgs_nidtbl_dir = NULL; + } + if (mgs->mgs_los) { + local_oid_storage_fini(env, mgs->mgs_los); + mgs->mgs_los = NULL; + } + + return 0; }