X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmgs%2Fmgs_fs.c;h=231b6af9675a1589888be1bbeb6eaec52745c354;hb=df7c3d41c67674df4fe137084ed8afedd3be89aa;hp=4b87e84afd64e4670b4f58b974ee24ca491362ce;hpb=feb80fe0c440f7790cc3afa53d048370374a81b1;p=fs%2Flustre-release.git diff --git a/lustre/mgs/mgs_fs.c b/lustre/mgs/mgs_fs.c index 4b87e84..231b6af 100644 --- a/lustre/mgs/mgs_fs.c +++ b/lustre/mgs/mgs_fs.c @@ -1,6 +1,4 @@ -/* -*- 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. @@ -26,8 +24,10 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011, 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -38,31 +38,21 @@ * Lustre Management Server (MGS) filesystem interface code * * Author: Nathan Rutman + * Author: Alex Zhuravlev */ -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif #define DEBUG_SUBSYSTEM S_MGS -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include "mgs_internal.h" -static int mgs_export_stats_init(struct obd_device *obd, struct obd_export *exp, - void *localdata) +int mgs_export_stats_init(struct obd_device *obd, struct obd_export *exp, + void *localdata) + { lnet_nid_t *client_nid = localdata; int rc, newnid; + ENTRY; rc = lprocfs_exp_setup(exp, client_nid, &newnid); if (rc) { @@ -70,23 +60,31 @@ static int mgs_export_stats_init(struct obd_device *obd, struct obd_export *exp, * /proc entries */ if (rc == -EALREADY) rc = 0; - return rc; + RETURN(rc); } - - if (!obd->md_stats && - lprocfs_alloc_md_stats(obd, LPROC_MGS_LAST)) - return rc; if (newnid) { - /* Always add in ldlm_stats */ - exp->exp_nid_stats->nid_ldlm_stats = - lprocfs_alloc_stats(LDLM_LAST_OPC - LDLM_FIRST_OPC, 0); - if (exp->exp_nid_stats->nid_ldlm_stats == NULL) + 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_ldlm_stats(exp->exp_nid_stats->nid_ldlm_stats); - rc = lprocfs_register_stats(exp->exp_nid_stats->nid_proc, - "ldlm_stats", - exp->exp_nid_stats->nid_ldlm_stats); + 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); } + RETURN(0); +clean: return rc; } @@ -98,7 +96,7 @@ static int mgs_export_stats_init(struct obd_device *obd, struct obd_export *exp, int mgs_client_add(struct obd_device *obd, struct obd_export *exp, void *localdata) { - return mgs_export_stats_init(obd, exp, localdata); + return 0; } /* Remove client export data from the MGS */ @@ -107,155 +105,94 @@ int mgs_client_free(struct obd_export *exp) return 0; } -/* Same as mds_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_fid2dentry(struct mgs_obd *mgs, - __u64 ino, __u32 gen) -{ - char fid_name[32]; - struct inode *inode; - struct dentry *result; - ENTRY; - - CDEBUG(D_DENTRY, "--> mgs_fid2dentry: ino/gen %lu/%u, sb %p\n", - (unsigned long)ino, gen, mgs->mgs_sb); - - if (ino == 0) - RETURN(ERR_PTR(-ESTALE)); - - snprintf(fid_name, sizeof(fid_name), "0x%lx", (unsigned long)ino); - - /* under ext3 this is neither supposed to return bad inodes nor NULL - inodes. */ - result = ll_lookup_one_len(fid_name, mgs->mgs_fid_de, strlen(fid_name)); - if (IS_ERR(result)) - RETURN(result); - - inode = result->d_inode; - if (!inode) - RETURN(ERR_PTR(-ENOENT)); - - if (inode->i_generation == 0 || inode->i_nlink == 0) { - LCONSOLE_WARN("Found inode with zero generation or link -- this" - " may indicate disk corruption (inode: %lu, link:" - " %lu, count: %d)\n", inode->i_ino, - (unsigned long)inode->i_nlink, - atomic_read(&inode->i_count)); - l_dput(result); - RETURN(ERR_PTR(-ENOENT)); - } - - if (gen && inode->i_generation != gen) { - /* we didn't find the right inode.. */ - CDEBUG(D_INODE, "found wrong generation: inode %lu, link: %lu, " - "count: %d, generation %u/%u\n", inode->i_ino, - (unsigned long)inode->i_nlink, atomic_read(&inode->i_count), - inode->i_generation, gen); - l_dput(result); - RETURN(ERR_PTR(-ENOENT)); - } - - RETURN(result); -} - -static struct dentry *mgs_lvfs_fid2dentry(__u64 id, __u32 gen, - __u64 gr, void *data) -{ - struct obd_device *obd = data; - return mgs_fid2dentry(&obd->u.mgs, id, gen); -} - -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_setup(const struct lu_env *env, struct mgs_device *mgs) { - struct mgs_obd *mgs = &obd->u.mgs; - struct lvfs_run_ctxt saved; - struct dentry *dentry; - int rc; - ENTRY; - - /* FIXME what's this? Do I need it? */ - rc = cleanup_group_info(); - if (rc) - RETURN(rc); - - mgs->mgs_vfsmnt = mnt; - mgs->mgs_sb = mnt->mnt_root->d_inode->i_sb; - - fsfilt_setup(obd, mgs->mgs_sb); - - 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(current->fs->pwd, 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; - - /* Need the iopen dir for fid2dentry, required by - LLOG_ORIGIN_HANDLE_READ_HEADER */ - dentry = lookup_one_len("__iopen__", current->fs->pwd, - strlen("__iopen__")); - if (IS_ERR(dentry)) { - rc = PTR_ERR(dentry); - CERROR("cannot lookup __iopen__ directory: rc = %d\n", rc); - GOTO(err_configs, rc); - } - mgs->mgs_fid_de = dentry; - if (!dentry->d_inode || is_bad_inode(dentry->d_inode)) { - rc = -ENOENT; - CERROR("__iopen__ directory has no inode? rc = %d\n", rc); - GOTO(err_fid, rc); - } - -err_pop: - pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); - return rc; -err_fid: - dput(mgs->mgs_fid_de); -err_configs: - dput(mgs->mgs_configs_dir); - goto err_pop; + 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); + if (unlikely(IS_ERR(root))) + GOTO(out_los, 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)); + + 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; } -int mgs_fs_cleanup(struct obd_device *obd) +int mgs_fs_cleanup(const struct lu_env *env, struct mgs_device *mgs) { - struct mgs_obd *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) { - /*CERROR("configs dir dcount=%d\n", - atomic_read(&mgs->mgs_configs_dir->d_count));*/ - l_dput(mgs->mgs_configs_dir); - mgs->mgs_configs_dir = NULL; - } - - shrink_dcache_parent(mgs->mgs_fid_de); - /*CERROR("fid dir dcount=%d\n", - atomic_read(&mgs->mgs_fid_de->d_count));*/ - dput(mgs->mgs_fid_de); - - 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; }