X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fllite%2Fsuper.c;h=40ae6238b0eac84768155a9d059b6e34619c8b6e;hp=b79facddf21dd5b21861f5dc8602a0572f05c8aa;hb=400b0681017091fab9cef9bd00e0f536e1793dcc;hpb=4e4d97f8388b72d79839b9a6cdc4856d3d0d9c06 diff --git a/lustre/llite/super.c b/lustre/llite/super.c index b79facdd..40ae623 100644 --- a/lustre/llite/super.c +++ b/lustre/llite/super.c @@ -13,13 +13,17 @@ #include #include +#include #include #include #include #include #include #include +#include + +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) kmem_cache_t *ll_file_data_slab; extern struct address_space_operations ll_aops; extern struct address_space_operations ll_dir_aops; @@ -29,6 +33,15 @@ extern int ll_recover(struct recovd_data *, int); extern int ll_commitcbd_setup(struct ll_sb_info *); extern int ll_commitcbd_cleanup(struct ll_sb_info *); +extern int rd_dev_uuid(char* page, char **start, off_t off, + int count, int *eof, void *data); + +extern int rd_dev_name(char* page, char **start, off_t off, + int count, int *eof, void *data); + + +extern lprocfs_vars_t status_var_nm_1[]; + static char *ll_read_opt(const char *opt, char *data) { char *value; @@ -80,7 +93,7 @@ static void ll_options(char *options, char **ost, char **mds, int *flags) CDEBUG(D_SUPER, "this_char %s\n", this_char); if ( (!*ost && (*ost = ll_read_opt("osc", this_char)))|| (!*mds && (*mds = ll_read_opt("mdc", this_char)))|| - (!(*flags & LL_SBI_NOLCK) && ((*flags) = (*flags) | + (!(*flags & LL_SBI_NOLCK) && ((*flags) = (*flags) | ll_set_opt("nolock", this_char, LL_SBI_NOLCK))) ) continue; } @@ -102,13 +115,19 @@ static struct super_block * ll_read_super(struct super_block *sb, int err; struct ll_fid rootfid; struct obd_statfs osfs; - __u64 last_committed; - __u64 last_xid; struct ptlrpc_request *request = NULL; struct ptlrpc_connection *mdc_conn; struct ll_read_inode2_cookie lic; class_uuid_t uuid; + + /* Lprocfs variables */ + char mnt_name[100]; + char uuid_name[100]; + lprocfs_vars_t d_vars[3]; + + + ENTRY; MOD_INC_USE_COUNT; @@ -119,7 +138,6 @@ static struct super_block * ll_read_super(struct super_block *sb, } INIT_LIST_HEAD(&sbi->ll_conn_chain); - sbi->ll_mount_epoch = 0; generate_random_uuid(uuid); class_uuid_unparse(uuid, sbi->ll_sb_uuid); @@ -143,7 +161,8 @@ static struct super_block * ll_read_super(struct super_block *sb, GOTO(out_free, sb = NULL); } - err = obd_connect(&sbi->ll_mdc_conn, obd, sbi->ll_sb_uuid); + err = obd_connect(&sbi->ll_mdc_conn, obd, sbi->ll_sb_uuid, + ptlrpc_recovd, ll_recover); if (err) { CERROR("cannot connect to %s: rc = %d\n", mdc, err); GOTO(out_free, sb = NULL); @@ -160,27 +179,23 @@ static struct super_block * ll_read_super(struct super_block *sb, GOTO(out_mdc, sb = NULL); } - err = obd_connect(&sbi->ll_osc_conn, obd, sbi->ll_sb_uuid); + err = obd_connect(&sbi->ll_osc_conn, obd, sbi->ll_sb_uuid, + ptlrpc_recovd, ll_recover); if (err) { CERROR("cannot connect to %s: rc = %d\n", osc, err); GOTO(out_mdc, sb = NULL); } - /* XXX: need to store the last_* values somewhere */ - err = mdc_getstatus(&sbi->ll_mdc_conn, &rootfid, &last_committed, - &last_xid, &request); - ptlrpc_req_finished(request); + err = mdc_getstatus(&sbi->ll_mdc_conn, &rootfid); if (err) { CERROR("cannot mds_connect: rc = %d\n", err); GOTO(out_mdc, sb = NULL); } - CDEBUG(D_SUPER, "rootfid %Ld\n", (unsigned long long)rootfid.id); + CDEBUG(D_SUPER, "rootfid "LPU64"\n", rootfid.id); sbi->ll_rootino = rootfid.id; memset(&osfs, 0, sizeof(osfs)); - request = NULL; - err = mdc_statfs(&sbi->ll_mdc_conn, &osfs, &request); - ptlrpc_req_finished(request); + err = obd_statfs(&sbi->ll_mdc_conn, &osfs); sb->s_blocksize = osfs.os_bsize; sb->s_blocksize_bits = log2(osfs.os_bsize); sb->s_magic = LL_SUPER_MAGIC; @@ -189,7 +204,6 @@ static struct super_block * ll_read_super(struct super_block *sb, sb->s_op = &ll_super_operations; /* make root inode */ - request = NULL; err = mdc_getattr(&sbi->ll_mdc_conn, sbi->ll_rootino, S_IFDIR, OBD_MD_FLNOTOBD|OBD_MD_FLBLOCKS, 0, &request); if (err) { @@ -210,6 +224,7 @@ static struct super_block * ll_read_super(struct super_block *sb, lic.lic_body = lustre_msg_buf(request->rq_repmsg, 0); lic.lic_lmm = NULL; + LASSERT(sbi->ll_rootino != 0); root = iget4(sb, sbi->ll_rootino, NULL, &lic); if (root) { @@ -220,7 +235,67 @@ static struct super_block * ll_read_super(struct super_block *sb, } ptlrpc_req_finished(request); + request = NULL; + + + /* Register this mount instance with LProcFS */ + + snprintf(mnt_name, 100, "mount_%s", sbi->ll_sb_uuid); + sbi->ll_mnt_root=lprocfs_reg_mnt(mnt_name); + if(!sbi->ll_mnt_root) + goto out_dev; + + /* Add the static configuration info */ + lprocfs_add_vars(sbi->ll_mnt_root, (lprocfs_vars_t*)status_var_nm_1, + (void*)sb); + /* Add the dynamic configuration stuff */ + /* MDC */ + obd = class_uuid2obd(mdc); + + /* Reuse mnt_name */ + + sprintf(mnt_name, "status/%s/common_name", obd->obd_type->typ_name); + + memset(d_vars, 0, sizeof(d_vars)); + d_vars[0].read_fptr=rd_dev_name; + d_vars[0].write_fptr=0; + d_vars[0].name=(char*)mnt_name; + + memset(uuid_name, '\0', strlen(uuid_name)); + sprintf(uuid_name, "status/%s/uuid", obd->obd_type->typ_name); + d_vars[1].read_fptr=rd_dev_uuid; + d_vars[1].write_fptr=0; + d_vars[1].name=(char*)uuid_name; + + err=lprocfs_add_vars(sbi->ll_mnt_root, (lprocfs_vars_t*)d_vars, + (void*)obd); + if (err) { + CDEBUG(D_OTHER, "Unable to add fs proc dynamic variables"); + } + + /* OSC or LOV*/ + obd = class_uuid2obd(osc); + /* Reuse mnt_name */ + memset(mnt_name, '\0', strlen(mnt_name)); + sprintf(mnt_name, "status/%s/common_name", obd->obd_type->typ_name); + + memset(d_vars, 0, sizeof(d_vars)); + d_vars[0].read_fptr=rd_dev_name; + d_vars[0].write_fptr=0; + d_vars[0].name=(char*)mnt_name; + + memset(uuid_name, '\0', strlen(uuid_name)); + sprintf(uuid_name, "status/%s/uuid", obd->obd_type->typ_name); + d_vars[1].read_fptr=rd_dev_uuid; + d_vars[1].write_fptr=0; + d_vars[1].name=(char*)uuid_name; + + err=lprocfs_add_vars(sbi->ll_mnt_root, (lprocfs_vars_t*)d_vars, + (void*)obd); + if (err) { + CDEBUG(D_OTHER, "Unable to add fs proc dynamic variables"); + } out_dev: if (mdc) OBD_FREE(mdc, strlen(mdc) + 1); @@ -246,11 +321,22 @@ out_free: static void ll_put_super(struct super_block *sb) { struct ll_sb_info *sbi = ll_s2sbi(sb); - + struct ll_fid rootfid; ENTRY; + list_del(&sbi->ll_conn_chain); ll_commitcbd_cleanup(sbi); obd_disconnect(&sbi->ll_osc_conn); + + /* NULL request to force sync on the MDS, and get the last_committed + * value to flush remaining RPCs from the sending queue on client. + * + * XXX This should be an mdc_sync() call to sync the whole MDS fs, + * which we can call for other reasons as well. + */ + mdc_getstatus(&sbi->ll_mdc_conn, &rootfid); + + lprocfs_dereg_mnt(sbi->ll_mnt_root); obd_disconnect(&sbi->ll_mdc_conn); OBD_FREE(sbi, sizeof(*sbi)); @@ -260,8 +346,16 @@ static void ll_put_super(struct super_block *sb) static void ll_clear_inode(struct inode *inode) { + struct ll_sb_info *sbi = ll_i2sbi(inode); + int rc; ENTRY; + rc = mdc_cancel_unused(&sbi->ll_mdc_conn, inode, LDLM_FL_NO_CALLBACK); + if (rc < 0) { + CERROR("obd_cancel_unused: %d\n", rc); + /* XXX FIXME do something dramatic */ + } + if (atomic_read(&inode->i_count) == 0) { struct ll_inode_info *lli = ll_i2info(inode); struct lov_stripe_md *lsm = lli->lli_smd; @@ -276,6 +370,7 @@ static void ll_clear_inode(struct inode *inode) lli->lli_symlink_name = NULL; } } + EXIT; } @@ -379,16 +474,14 @@ int ll_setattr(struct dentry *de, struct iattr *attr) static int ll_statfs(struct super_block *sb, struct statfs *sfs) { - struct ptlrpc_request *request = NULL; struct ll_sb_info *sbi = ll_s2sbi(sb); struct obd_statfs osfs; int rc; ENTRY; memset(sfs, 0, sizeof(*sfs)); - rc = mdc_statfs(&sbi->ll_mdc_conn, &osfs, &request); + rc = obd_statfs(&sbi->ll_mdc_conn, &osfs); statfs_unpack(sfs, &osfs); - ptlrpc_req_finished(request); if (rc) CERROR("mdc_statfs fails: rc = %d\n", rc); else @@ -463,10 +556,9 @@ static void ll_read_inode2(struct inode *inode, void *opaque) struct mds_body *body = lic->lic_body; struct ll_inode_info *lli = ll_i2info(inode); ENTRY; - + sema_init(&lli->lli_open_sem, 1); - lli->lli_mount_epoch = ll_i2sbi(inode)->ll_mount_epoch; - + /* core attributes first */ ll_update_inode(inode, body); @@ -475,6 +567,9 @@ static void ll_read_inode2(struct inode *inode, void *opaque) struct lov_mds_md *lmm = lic->lic_lmm; int size; + /* XXX This should probably not be an error in the future, + * when we allow LOV OSTs to be added. + */ if (lmm->lmm_easize != ll_mds_easize(inode->i_sb)) { CERROR("Striping metadata size error %ld\n", inode->i_ino); @@ -528,9 +623,9 @@ static inline void invalidate_request_list(struct list_head *req_list) { struct list_head *tmp, *n; list_for_each_safe(tmp, n, req_list) { - struct ptlrpc_request *req = + struct ptlrpc_request *req = list_entry(tmp, struct ptlrpc_request, rq_list); - CERROR("invalidating req xid %d op %d to %s:%d\n", + CERROR("invalidating req xid "LPD64" op %d to %s:%d\n", (unsigned long long)req->rq_xid, req->rq_reqmsg->opc, req->rq_connection->c_remote_uuid, req->rq_import->imp_client->cli_request_portal); @@ -545,12 +640,14 @@ void ll_umount_begin(struct super_block *sb) struct list_head *ctmp; ENTRY; - + list_for_each(ctmp, &sbi->ll_conn_chain) { struct ptlrpc_connection *conn; conn = list_entry(ctmp, struct ptlrpc_connection, c_sb_chain); spin_lock(&conn->c_lock); + /* XXX should just be dealing with imports, probably through + * XXX iocontrol, need next-gen recovery! */ conn->c_flags |= CONN_INVALID; invalidate_request_list(&conn->c_sending_head); invalidate_request_list(&conn->c_delayed_head); @@ -598,3 +695,4 @@ MODULE_LICENSE("GPL"); module_init(init_lustre_lite); module_exit(exit_lustre_lite); +#endif