X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fllite_lib.c;h=a0b502737aada978327d7f6a32075a7fc6b50781;hb=04f2d8ab2524851477f0b6fbffbc115d0c82fdc6;hp=fd6e976673979e35854b250fcd52e5fabbb05f6f;hpb=1cc2498510e2e6f2a3dfd16f9fc323aa4a90faad;p=fs%2Flustre-release.git diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index fd6e976..a0b5027 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -30,6 +30,9 @@ * Use is subject to license terms. */ /* + * Copyright (c) 2011 Whamcloud, Inc. + */ +/* * This file is part of Lustre, http://www.lustre.org/ * Lustre is a trademark of Sun Microsystems, Inc. * @@ -162,13 +165,14 @@ static struct dentry_operations ll_d_root_ops = { .d_revalidate = ll_revalidate_nd, }; -static int client_common_fill_super(struct super_block *sb, char *md, char *dt) +static int client_common_fill_super(struct super_block *sb, char *md, char *dt, + struct vfsmount *mnt) { struct inode *root = 0; struct ll_sb_info *sbi = ll_s2sbi(sb); struct obd_device *obd; struct obd_capa *oc = NULL; - struct obd_statfs osfs; + struct obd_statfs *osfs = NULL; struct ptlrpc_request *request = NULL; struct obd_connect_data *data = NULL; struct obd_uuid *uuid; @@ -188,6 +192,12 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt) if (data == NULL) RETURN(-ENOMEM); + OBD_ALLOC_PTR(osfs); + if (osfs == NULL) { + OBD_FREE_PTR(data); + RETURN(-ENOMEM); + } + if (proc_lustre_fs_root) { err = lprocfs_register_mountpoint(proc_lustre_fs_root, sb, dt, md); @@ -197,13 +207,13 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt) /* indicate the features supported by this client */ data->ocd_connect_flags = OBD_CONNECT_IBITS | OBD_CONNECT_NODEVOH | - OBD_CONNECT_JOIN | OBD_CONNECT_ATTRFID | - OBD_CONNECT_VERSION | OBD_CONNECT_MDS_CAPA | - OBD_CONNECT_OSS_CAPA | OBD_CONNECT_CANCELSET| - OBD_CONNECT_FID | OBD_CONNECT_AT | - OBD_CONNECT_LOV_V3 | OBD_CONNECT_RMT_CLIENT | - OBD_CONNECT_VBR | OBD_CONNECT_FULL20 | - OBD_CONNECT_64BITHASH; + OBD_CONNECT_ATTRFID | + OBD_CONNECT_VERSION | OBD_CONNECT_BRW_SIZE | + OBD_CONNECT_MDS_CAPA | OBD_CONNECT_OSS_CAPA | + OBD_CONNECT_CANCELSET | OBD_CONNECT_FID | + OBD_CONNECT_AT | OBD_CONNECT_LOV_V3 | + OBD_CONNECT_RMT_CLIENT | OBD_CONNECT_VBR | + OBD_CONNECT_FULL20 | OBD_CONNECT_64BITHASH; if (sbi->ll_flags & LL_SBI_SOM_PREVIEW) data->ocd_connect_flags |= OBD_CONNECT_SOM; @@ -243,6 +253,8 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt) if (sbi->ll_flags & LL_SBI_RMT_CLIENT) data->ocd_connect_flags |= OBD_CONNECT_RMT_CLIENT_FORCE; + data->ocd_brw_size = PTLRPC_MAX_BRW_SIZE; + err = obd_connect(NULL, &sbi->ll_md_exp, obd, &sbi->ll_sb_uuid, data, NULL); if (err == -EBUSY) { LCONSOLE_ERROR_MSG(0x14f, "An MDT (md %s) is performing " @@ -262,11 +274,35 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt) GOTO(out_md, err); } - err = obd_statfs(obd, &osfs, + err = obd_statfs(obd, osfs, cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), 0); if (err) GOTO(out_md_fid, err); + /* This needs to be after statfs to ensure connect has finished. + * Note that "data" does NOT contain the valid connect reply. + * If connecting to a 1.8 server there will be no LMV device, so + * we can access the MDC export directly and exp_connect_flags will + * be non-zero, but if accessing an upgraded 2.1 server it will + * have the correct flags filled in. + * XXX: fill in the LMV exp_connect_flags from MDC(s). */ + valid = sbi->ll_md_exp->exp_connect_flags & CLIENT_CONNECT_MDT_REQD; + if (sbi->ll_md_exp->exp_connect_flags != 0 && + valid != CLIENT_CONNECT_MDT_REQD) { + char *buf; + + OBD_ALLOC_WAIT(buf, CFS_PAGE_SIZE); + obd_connect_flags2str(buf, CFS_PAGE_SIZE, + valid ^ CLIENT_CONNECT_MDT_REQD, ","); + LCONSOLE_ERROR_MSG(0x170, "Server %s does not support " + "feature(s) needed for correct operation " + "of this client (%s). Please upgrade " + "server or downgrade client.\n", + sbi->ll_md_exp->exp_obd->obd_name, buf); + OBD_FREE(buf, CFS_PAGE_SIZE); + GOTO(out_md, err = -EPROTO); + } + size = sizeof(*data); err = obd_get_info(sbi->ll_md_exp, sizeof(KEY_CONN_DATA), KEY_CONN_DATA, &size, data, NULL); @@ -275,9 +311,9 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt) GOTO(out_md, err); } - LASSERT(osfs.os_bsize); - sb->s_blocksize = osfs.os_bsize; - sb->s_blocksize_bits = log2(osfs.os_bsize); + LASSERT(osfs->os_bsize); + sb->s_blocksize = osfs->os_bsize; + sb->s_blocksize_bits = log2(osfs->os_bsize); sb->s_magic = LL_SUPER_MAGIC; /* for bug 11559. in $LINUX/fs/read_write.c, function do_sendfile(): @@ -293,7 +329,7 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt) #else sb->s_maxbytes = PAGE_CACHE_MAXBYTES; #endif - sbi->ll_namelen = osfs.os_namelen; + sbi->ll_namelen = osfs->os_namelen; sbi->ll_max_rw_chunk = LL_DEFAULT_MAX_RW_CHUNK; if ((sbi->ll_flags & LL_SBI_USER_XATTR) && @@ -339,6 +375,14 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt) sbi->ll_flags |= LL_SBI_OSS_CAPA; } + if (data->ocd_connect_flags & OBD_CONNECT_64BITHASH) + sbi->ll_flags |= LL_SBI_64BIT_HASH; + + if (data->ocd_connect_flags & OBD_CONNECT_BRW_SIZE) + sbi->ll_md_brw_size = data->ocd_brw_size; + else + sbi->ll_md_brw_size = CFS_PAGE_SIZE; + obd = class_name2obd(dt); if (!obd) { CERROR("DT %s: not setup or attached\n", dt); @@ -351,7 +395,8 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt) OBD_CONNECT_SRVLOCK | OBD_CONNECT_TRUNCLOCK| OBD_CONNECT_AT | OBD_CONNECT_RMT_CLIENT | OBD_CONNECT_OSS_CAPA | OBD_CONNECT_VBR| - OBD_CONNECT_FULL20; + OBD_CONNECT_FULL20 | OBD_CONNECT_64BITHASH | + OBD_CONNECT_MAXBYTES; if (sbi->ll_flags & LL_SBI_SOM_PREVIEW) data->ocd_connect_flags |= OBD_CONNECT_SOM; @@ -382,7 +427,8 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt) obd->obd_upcall.onu_owner = &sbi->ll_lco; obd->obd_upcall.onu_upcall = cl_ocd_update; - data->ocd_brw_size = PTLRPC_MAX_BRW_PAGES << CFS_PAGE_SHIFT; + + data->ocd_brw_size = PTLRPC_MAX_BRW_SIZE; err = obd_connect(NULL, &sbi->ll_dt_exp, obd, &sbi->ll_sb_uuid, data, NULL); if (err == -EBUSY) { @@ -435,7 +481,7 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt) valid |= OBD_MD_FLACL; OBD_ALLOC_PTR(op_data); - if (op_data == NULL) + if (op_data == NULL) GOTO(out_lock_cn_cb, err = -ENOMEM); op_data->op_fid1 = sbi->ll_root_fid; @@ -500,9 +546,6 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt) cl_sb_init(sb); sb->s_root = d_alloc_root(root); - if (data != NULL) - OBD_FREE(data, sizeof(*data)); - sb->s_root->d_op = &ll_d_root_ops; sbi->ll_sdev_orig = sb->s_dev; @@ -515,6 +558,12 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt) uuid = obd_get_uuid(sbi->ll_md_exp); if (uuid != NULL) sb->s_dev = get_uuid2int(uuid->uuid, strlen(uuid->uuid)); + sbi->ll_mnt = mnt; + + if (data != NULL) + OBD_FREE_PTR(data); + if (osfs != NULL) + OBD_FREE_PTR(osfs); RETURN(err); out_root: @@ -533,6 +582,8 @@ out_md: out: if (data != NULL) OBD_FREE_PTR(data); + if (osfs != NULL) + OBD_FREE_PTR(osfs); lprocfs_unregister_mountpoint(sbi); return err; } @@ -825,6 +876,7 @@ void ll_lli_init(struct ll_inode_info *lli) CFS_INIT_LIST_HEAD(&lli->lli_oss_capas); cfs_spin_lock_init(&lli->lli_sa_lock); cfs_sema_init(&lli->lli_readdir_sem, 1); + fid_zero(&lli->lli_pfid); } static inline int ll_bdi_register(struct backing_dev_info *bdi) @@ -840,26 +892,31 @@ static inline int ll_bdi_register(struct backing_dev_info *bdi) #endif } -int ll_fill_super(struct super_block *sb) +int ll_fill_super(struct super_block *sb, struct vfsmount *mnt) { - struct lustre_profile *lprof; + struct lustre_profile *lprof = NULL; struct lustre_sb_info *lsi = s2lsi(sb); struct ll_sb_info *sbi; char *dt = NULL, *md = NULL; char *profilenm = get_profile_name(sb); - struct config_llog_instance cfg = {0, }; - char ll_instance[sizeof(sb) * 2 + 1]; + struct config_llog_instance *cfg; + const int instlen = sizeof(cfg->cfg_instance) * 2 + 1; int err; ENTRY; CDEBUG(D_VFSTRACE, "VFS Op: sb %p\n", sb); + OBD_ALLOC_PTR(cfg); + if (cfg == NULL) + RETURN(-ENOMEM); + cfs_module_get(); /* client additional sb info */ lsi->lsi_llsbi = sbi = ll_init_sbi(); if (!sbi) { cfs_module_put(THIS_MODULE); + OBD_FREE_PTR(cfg); RETURN(-ENOMEM); } @@ -883,12 +940,11 @@ int ll_fill_super(struct super_block *sb) /* Generate a string unique to this super, in case some joker tries to mount the same fs at two mount points. Use the address of the super itself.*/ - sprintf(ll_instance, "%p", sb); - cfg.cfg_instance = ll_instance; - cfg.cfg_uuid = lsi->lsi_llsbi->ll_sb_uuid; + cfg->cfg_instance = sb; + cfg->cfg_uuid = lsi->lsi_llsbi->ll_sb_uuid; /* set up client obds */ - err = lustre_process_log(sb, profilenm, &cfg); + err = lustre_process_log(sb, profilenm, cfg); if (err < 0) { CERROR("Unable to process log: %d\n", err); GOTO(out_free, err); @@ -905,31 +961,30 @@ int ll_fill_super(struct super_block *sb) CDEBUG(D_CONFIG, "Found profile %s: mdc=%s osc=%s\n", profilenm, lprof->lp_md, lprof->lp_dt); - OBD_ALLOC(dt, strlen(lprof->lp_dt) + - strlen(ll_instance) + 2); + OBD_ALLOC(dt, strlen(lprof->lp_dt) + instlen); if (!dt) GOTO(out_free, err = -ENOMEM); - sprintf(dt, "%s-%s", lprof->lp_dt, ll_instance); + sprintf(dt, "%s-%p", lprof->lp_dt, cfg->cfg_instance); - OBD_ALLOC(md, strlen(lprof->lp_md) + - strlen(ll_instance) + 2); + OBD_ALLOC(md, strlen(lprof->lp_md) + instlen); if (!md) GOTO(out_free, err = -ENOMEM); - sprintf(md, "%s-%s", lprof->lp_md, ll_instance); + sprintf(md, "%s-%p", lprof->lp_md, cfg->cfg_instance); /* connections, registrations, sb setup */ - err = client_common_fill_super(sb, md, dt); + err = client_common_fill_super(sb, md, dt, mnt); out_free: if (md) - OBD_FREE(md, strlen(md) + 1); + OBD_FREE(md, strlen(lprof->lp_md) + instlen); if (dt) - OBD_FREE(dt, strlen(dt) + 1); + OBD_FREE(dt, strlen(lprof->lp_dt) + instlen); if (err) ll_put_super(sb); else LCONSOLE_WARN("Client %s has started\n", profilenm); + OBD_FREE_PTR(cfg); RETURN(err); } /* ll_fill_super */ @@ -939,7 +994,6 @@ void lu_context_keys_dump(void); void ll_put_super(struct super_block *sb) { struct config_llog_instance cfg; - char ll_instance[sizeof(sb) * 2 + 1]; struct obd_device *obd; struct lustre_sb_info *lsi = s2lsi(sb); struct ll_sb_info *sbi = ll_s2sbi(sb); @@ -951,9 +1005,8 @@ void ll_put_super(struct super_block *sb) ll_print_capa_stat(sbi); - sprintf(ll_instance, "%p", sb); - cfg.cfg_instance = ll_instance; - lustre_end_log(sb, NULL, &cfg); + cfg.cfg_instance = sb; + lustre_end_log(sb, profilenm, &cfg); if (sbi->ll_md_exp) { obd = class_exp2obd(sbi->ll_md_exp); @@ -996,7 +1049,7 @@ void ll_put_super(struct super_block *sb) cl_env_cache_purge(~0); - LCONSOLE_WARN("client %s umount complete\n", ll_instance); + LCONSOLE_WARN("client %p umount complete\n", cfg.cfg_instance); cfs_module_put(THIS_MODULE); @@ -1515,7 +1568,9 @@ void ll_update_inode(struct inode *inode, struct lustre_md *md) * but lov raid0 is not setup yet and parallel e.g. * glimpse would try to use uninitialized lov */ cl_inode_init(inode, md); + cfs_spin_lock(&lli->lli_lock); lli->lli_smd = lsm; + cfs_spin_unlock(&lli->lli_lock); cfs_up(&lli->lli_och_sem); lli->lli_maxbytes = lsm->lsm_maxbytes; if (lli->lli_maxbytes > PAGE_CACHE_MAXBYTES) @@ -2126,6 +2181,21 @@ struct md_op_data * ll_prep_md_op_data(struct md_op_data *op_data, op_data->op_mds = 0; op_data->op_data = data; + /* If the file is being opened after mknod() (normally due to NFS) + * try to use the default stripe data from parent directory for + * allocating OST objects. Try to pass the parent FID to MDS. */ + if (opc == LUSTRE_OPC_CREATE && i1 == i2 && S_ISREG(i2->i_mode) && + ll_i2info(i2)->lli_smd == NULL) { + struct ll_inode_info *lli = ll_i2info(i2); + + cfs_spin_lock(&lli->lli_lock); + if (likely(lli->lli_smd == NULL && + !fid_is_zero(&lli->lli_pfid))) + op_data->op_fid1 = lli->lli_pfid; + cfs_spin_unlock(&lli->lli_lock); + /** We ignore parent's capability temporary. */ + } + return op_data; }