X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fllite%2Fnamei.c;h=d097614a9799026689d056a1069d6d3d5bab869e;hp=7976133bebd7df14aaf6d2a6233e52cc28e6e33e;hb=8ac020df4592fc6e85edd75d54cb3795a4e50f8e;hpb=13372d6c243ccfc1a0886469f3c0dc048783ed47 diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c index 7976133..d097614 100644 --- a/lustre/llite/namei.c +++ b/lustre/llite/namei.c @@ -161,7 +161,7 @@ static void ll_invalidate_negative_children(struct inode *dir) struct dentry *dentry, *tmp_subdir; DECLARE_LL_D_HLIST_NODE_PTR(p); - ll_lock_dcache(dir); + spin_lock(&dir->i_lock); ll_d_hlist_for_each_entry(dentry, p, &dir->i_dentry) { spin_lock(&dentry->d_lock); if (!list_empty(&dentry->d_subdirs)) { @@ -176,7 +176,7 @@ static void ll_invalidate_negative_children(struct inode *dir) } spin_unlock(&dentry->d_lock); } - ll_unlock_dcache(dir); + spin_unlock(&dir->i_lock); } int ll_test_inode_by_fid(struct inode *inode, void *opaque) @@ -184,53 +184,53 @@ int ll_test_inode_by_fid(struct inode *inode, void *opaque) return lu_fid_eq(&ll_i2info(inode)->lli_fid, opaque); } -int ll_dom_lock_cancel(struct inode *inode, struct ldlm_lock *lock) +static int ll_dom_lock_cancel(struct inode *inode, struct ldlm_lock *lock) { struct lu_env *env; struct ll_inode_info *lli = ll_i2info(inode); - struct cl_layout clt = { .cl_layout_gen = 0, }; - int rc; __u16 refcheck; - - + int rc; ENTRY; - if (!lli->lli_clob) + if (!lli->lli_clob) { + /* due to DoM read on open, there may exist pages for Lustre + * regular file even though cl_object is not set up yet. */ + truncate_inode_pages(inode->i_mapping, 0); RETURN(0); + } env = cl_env_get(&refcheck); if (IS_ERR(env)) RETURN(PTR_ERR(env)); - rc = cl_object_layout_get(env, lli->lli_clob, &clt); - if (rc) { - CDEBUG(D_INODE, "Cannot get layout for "DFID"\n", - PFID(ll_inode2fid(inode))); - rc = -ENODATA; - } else if (clt.cl_size == 0 || clt.cl_dom_comp_size == 0) { - CDEBUG(D_INODE, "DOM lock without DOM layout for "DFID"\n", - PFID(ll_inode2fid(inode))); - } else { - enum cl_fsync_mode mode; - loff_t end = clt.cl_dom_comp_size - 1; + /* reach MDC layer to flush data under the DoM ldlm lock */ + rc = cl_object_flush(env, lli->lli_clob, lock); - mode = ldlm_is_discard_data(lock) ? - CL_FSYNC_DISCARD : CL_FSYNC_LOCAL; - rc = cl_sync_file_range(inode, 0, end, mode, 1); - truncate_inode_pages_range(inode->i_mapping, 0, end); - } cl_env_put(env, &refcheck); RETURN(rc); } -void ll_lock_cancel_bits(struct ldlm_lock *lock, __u64 to_cancel) +static void ll_lock_cancel_bits(struct ldlm_lock *lock, __u64 to_cancel) { struct inode *inode = ll_inode_from_resource_lock(lock); + struct ll_inode_info *lli; __u64 bits = to_cancel; int rc; - if (inode == NULL) - return; + ENTRY; + + if (!inode) { + /* That means the inode is evicted most likely and may cause + * the skipping of lock cleanups below, so print the message + * about that in log. + */ + if (lock->l_resource->lr_lvb_inode) + LDLM_DEBUG(lock, + "can't take inode for the lock (%sevicted)\n", + lock->l_resource->lr_lvb_inode->i_state & + I_FREEING ? "" : "not "); + RETURN_EXIT; + } if (!fid_res_name_eq(ll_inode2fid(inode), &lock->l_resource->lr_name)) { @@ -240,8 +240,6 @@ void ll_lock_cancel_bits(struct ldlm_lock *lock, __u64 to_cancel) } if (bits & MDS_INODELOCK_XATTR) { - if (S_ISDIR(inode->i_mode)) - ll_i2info(inode)->lli_def_stripe_offset = -1; ll_xattr_cache_destroy(inode); bits &= ~MDS_INODELOCK_XATTR; } @@ -285,9 +283,6 @@ void ll_lock_cancel_bits(struct ldlm_lock *lock, __u64 to_cancel) CDEBUG(D_INODE, "cannot flush DoM data " DFID": rc = %d\n", PFID(ll_inode2fid(inode)), rc); - lock_res_and_lock(lock); - ldlm_set_kms_ignore(lock); - unlock_res_and_lock(lock); } if (bits & MDS_INODELOCK_LAYOUT) { @@ -303,15 +298,12 @@ void ll_lock_cancel_bits(struct ldlm_lock *lock, __u64 to_cancel) PFID(ll_inode2fid(inode)), rc); } - if (bits & MDS_INODELOCK_UPDATE) { - struct ll_inode_info *lli = ll_i2info(inode); + lli = ll_i2info(inode); + if (bits & MDS_INODELOCK_UPDATE) lli->lli_update_atime = 1; - } if ((bits & MDS_INODELOCK_UPDATE) && S_ISDIR(inode->i_mode)) { - struct ll_inode_info *lli = ll_i2info(inode); - CDEBUG(D_INODE, "invalidating inode "DFID" lli = %p, " "pfid = "DFID"\n", PFID(ll_inode2fid(inode)), lli, PFID(&lli->lli_pfid)); @@ -367,7 +359,11 @@ void ll_lock_cancel_bits(struct ldlm_lock *lock, __u64 to_cancel) inode != inode->i_sb->s_root->d_inode) ll_invalidate_aliases(inode); + if (bits & (MDS_INODELOCK_LOOKUP | MDS_INODELOCK_PERM)) + forget_all_cached_acls(inode); + iput(inode); + RETURN_EXIT; } /* Check if the given lock may be downgraded instead of canceling and @@ -399,11 +395,13 @@ int ll_md_need_convert(struct ldlm_lock *lock) switch (lock->l_req_mode) { case LCK_PR: mode = LCK_PR; + /* fallthrough */ case LCK_PW: mode |= LCK_CR; break; case LCK_CW: mode = LCK_CW; + /* fallthrough */ case LCK_CR: mode |= LCK_CR; break; @@ -462,6 +460,10 @@ int ll_md_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc, break; } case LDLM_CB_CANCELING: + /* Nothing to do for non-granted locks */ + if (!ldlm_is_granted(lock)) + break; + if (ldlm_is_converting(lock)) { /* this is called on already converted lock, so * ibits has remained bits only and cancel_bits @@ -526,7 +528,7 @@ static struct dentry *ll_find_alias(struct inode *inode, struct dentry *dentry) discon_alias = invalid_alias = NULL; - ll_lock_dcache(inode); + spin_lock(&inode->i_lock); ll_d_hlist_for_each_entry(alias, p, &inode->i_dentry) { LASSERT(alias != dentry); @@ -552,7 +554,7 @@ static struct dentry *ll_find_alias(struct inode *inode, struct dentry *dentry) dget_dlock(alias); spin_unlock(&alias->d_lock); } - ll_unlock_dcache(inode); + spin_unlock(&inode->i_lock); return alias; } @@ -593,7 +595,8 @@ struct dentry *ll_splice_alias(struct inode *inode, struct dentry *de) static int ll_lookup_it_finish(struct ptlrpc_request *request, struct lookup_intent *it, - struct inode *parent, struct dentry **de) + struct inode *parent, struct dentry **de, + void *secctx, __u32 secctxlen) { struct inode *inode = NULL; __u64 bits = 0; @@ -606,6 +609,10 @@ static int ll_lookup_it_finish(struct ptlrpc_request *request, CDEBUG(D_DENTRY, "it %p it_disposition %x\n", it, it->it_disposition); if (!it_disposition(it, DISP_LOOKUP_NEG)) { + struct req_capsule *pill = &request->rq_pill; + struct mdt_body *body = req_capsule_server_get(pill, + &RMF_MDT_BODY); + rc = ll_prep_inode(&inode, request, (*de)->d_sb, it); if (rc) RETURN(rc); @@ -624,6 +631,33 @@ static int ll_lookup_it_finish(struct ptlrpc_request *request, * ll_glimpse_size or some equivalent themselves anyway. * Also see bug 7198. */ + + /* If security context was returned by MDT, put it in + * inode now to save an extra getxattr from security hooks, + * and avoid deadlock. + */ + if (body->mbo_valid & OBD_MD_SECCTX) { + secctx = req_capsule_server_get(pill, &RMF_FILE_SECCTX); + secctxlen = req_capsule_get_size(pill, + &RMF_FILE_SECCTX, + RCL_SERVER); + + if (secctxlen) + CDEBUG(D_SEC, "server returned security context" + " for "DFID"\n", + PFID(ll_inode2fid(inode))); + } + + if (secctx != NULL && secctxlen != 0) { + inode_lock(inode); + rc = security_inode_notifysecctx(inode, secctx, + secctxlen); + inode_unlock(inode); + if (rc) + CWARN("cannot set security context for " + DFID": rc = %d\n", + PFID(ll_inode2fid(inode)), rc); + } } /* Only hash *de if it is unhashed (new dentry). @@ -640,9 +674,9 @@ static int ll_lookup_it_finish(struct ptlrpc_request *request, if (bits & MDS_INODELOCK_LOOKUP) d_lustre_revalidate(*de); } else if (!it_disposition(it, DISP_OPEN_CREATE)) { - /* If file created on server, don't depend on parent UPDATE - * lock to unhide it. It is left hidden and next lookup can - * find it in ll_splice_alias. + /* + * If file was created on the server, the dentry is revalidated + * in ll_create_it if the lock allows for it. */ /* Check that parent has UPDATE lock. */ struct lookup_intent parent_it = { @@ -651,7 +685,7 @@ static int ll_lookup_it_finish(struct ptlrpc_request *request, struct lu_fid fid = ll_i2info(parent)->lli_fid; /* If it is striped directory, get the real stripe parent */ - if (unlikely(ll_i2info(parent)->lli_lsm_md != NULL)) { + if (unlikely(ll_dir_striped(parent))) { rc = md_get_fid_from_lsm(ll_i2mdexp(parent), ll_i2info(parent)->lli_lsm_md, (*de)->d_name.name, @@ -676,17 +710,26 @@ out: return rc; } +struct pcc_create_attach { + struct pcc_dataset *pca_dataset; + struct dentry *pca_dentry; +}; + static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry, struct lookup_intent *it, - void **secctx, __u32 *secctxlen) + void **secctx, __u32 *secctxlen, + struct pcc_create_attach *pca) { struct lookup_intent lookup_it = { .it_op = IT_LOOKUP }; struct dentry *save = dentry, *retval; struct ptlrpc_request *req = NULL; struct md_op_data *op_data = NULL; - __u32 opc; - int rc; - ENTRY; + struct lov_user_md *lum = NULL; + __u32 opc; + int rc; + char secctx_name[XATTR_NAME_MAX + 1]; + + ENTRY; if (dentry->d_name.len > ll_i2sbi(parent)->ll_namelen) RETURN(ERR_PTR(-ENAMETOOLONG)); @@ -708,7 +751,7 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry, } if (it->it_op & IT_OPEN && it->it_flags & FMODE_WRITE && - dentry->d_sb->s_flags & MS_RDONLY) + dentry->d_sb->s_flags & SB_RDONLY) RETURN(ERR_PTR(-EROFS)); if (it->it_op & IT_CREAT) @@ -738,6 +781,54 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry, *secctx = op_data->op_file_secctx; if (secctxlen != NULL) *secctxlen = op_data->op_file_secctx_size; + } else { + if (secctx != NULL) + *secctx = NULL; + if (secctxlen != NULL) + *secctxlen = 0; + } + + /* ask for security context upon intent */ + if (it->it_op & (IT_LOOKUP | IT_GETATTR | IT_OPEN)) { + /* get name of security xattr to request to server */ + rc = ll_listsecurity(parent, secctx_name, + sizeof(secctx_name)); + if (rc < 0) { + CDEBUG(D_SEC, "cannot get security xattr name for " + DFID": rc = %d\n", + PFID(ll_inode2fid(parent)), rc); + } else if (rc > 0) { + op_data->op_file_secctx_name = secctx_name; + op_data->op_file_secctx_name_size = rc; + CDEBUG(D_SEC, "'%.*s' is security xattr for "DFID"\n", + rc, secctx_name, PFID(ll_inode2fid(parent))); + } + } + + if (pca && pca->pca_dataset) { + struct pcc_dataset *dataset = pca->pca_dataset; + + OBD_ALLOC_PTR(lum); + if (lum == NULL) + GOTO(out, retval = ERR_PTR(-ENOMEM)); + + lum->lmm_magic = LOV_USER_MAGIC_V1; + lum->lmm_pattern = LOV_PATTERN_F_RELEASED | LOV_PATTERN_RAID0; + op_data->op_data = lum; + op_data->op_data_size = sizeof(*lum); + op_data->op_archive_id = dataset->pccd_rwid; + + rc = obd_fid_alloc(NULL, ll_i2mdexp(parent), &op_data->op_fid2, + op_data); + if (rc) + GOTO(out, retval = ERR_PTR(rc)); + + rc = pcc_inode_create(parent->i_sb, dataset, &op_data->op_fid2, + &pca->pca_dentry); + if (rc) + GOTO(out, retval = ERR_PTR(rc)); + + it->it_flags |= MDS_OPEN_PCC; } rc = md_intent_lock(ll_i2mdexp(parent), op_data, it, &req, @@ -771,7 +862,11 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry, if (rc < 0) GOTO(out, retval = ERR_PTR(rc)); - rc = ll_lookup_it_finish(req, it, parent, &dentry); + /* dir layout may change */ + ll_unlock_md_op_lsm(op_data); + rc = ll_lookup_it_finish(req, it, parent, &dentry, + secctx != NULL ? *secctx : NULL, + secctxlen != NULL ? *secctxlen : 0); if (rc != 0) { ll_intent_release(it); GOTO(out, retval = ERR_PTR(rc)); @@ -797,6 +892,9 @@ out: ll_finish_md_op_data(op_data); } + if (lum != NULL) + OBD_FREE_PTR(lum); + ptlrpc_req_finished(req); return retval; } @@ -825,7 +923,7 @@ static struct dentry *ll_lookup_nd(struct inode *parent, struct dentry *dentry, itp = NULL; else itp = ⁢ - de = ll_lookup_it(parent, dentry, itp, NULL, NULL); + de = ll_lookup_it(parent, dentry, itp, NULL, NULL, NULL); if (itp != NULL) ll_intent_release(itp); @@ -833,26 +931,50 @@ static struct dentry *ll_lookup_nd(struct inode *parent, struct dentry *dentry, return de; } +#ifdef FMODE_CREATED /* added in Linux v4.18-rc1-20-g73a09dd */ +# define ll_is_opened(o, f) ((f)->f_mode & FMODE_OPENED) +# define ll_finish_open(f, d, o) finish_open((f), (d), NULL) +# define ll_last_arg +# define ll_set_created(o, f) \ +do { \ + (f)->f_mode |= FMODE_CREATED; \ +} while (0) + +#else +# define ll_is_opened(o, f) (*(o)) +# define ll_finish_open(f, d, o) finish_open((f), (d), NULL, (o)) +# define ll_last_arg , int *opened +# define ll_set_created(o, f) \ +do { \ + *(o) |= FILE_CREATED; \ +} while (0) + +#endif + /* * For cached negative dentry and new dentry, handle lookup/create/open * together. */ static int ll_atomic_open(struct inode *dir, struct dentry *dentry, struct file *file, unsigned open_flags, - umode_t mode, int *opened) + umode_t mode ll_last_arg) { struct lookup_intent *it; struct dentry *de; long long lookup_flags = LOOKUP_OPEN; void *secctx = NULL; __u32 secctxlen = 0; + struct ll_sb_info *sbi; + struct pcc_create_attach pca = {NULL, NULL}; + struct pcc_dataset *dataset = NULL; int rc = 0; ENTRY; CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s, dir="DFID"(%p), file %p," "open_flags %x, mode %x opened %d\n", dentry->d_name.len, dentry->d_name.name, - PFID(ll_inode2fid(dir)), dir, file, open_flags, mode, *opened); + PFID(ll_inode2fid(dir)), dir, file, open_flags, mode, + ll_is_opened(opened, file)); /* Only negative dentries enter here */ LASSERT(dentry->d_inode == NULL); @@ -880,13 +1002,27 @@ static int ll_atomic_open(struct inode *dir, struct dentry *dentry, if (open_flags & O_CREAT) { it->it_op |= IT_CREAT; lookup_flags |= LOOKUP_CREATE; + sbi = ll_i2sbi(dir); + /* Volatile file is used for HSM restore, so do not use PCC */ + if (!filename_is_volatile(dentry->d_name.name, + dentry->d_name.len, NULL)) { + struct pcc_matcher item; + + item.pm_uid = from_kuid(&init_user_ns, current_uid()); + item.pm_gid = from_kgid(&init_user_ns, current_gid()); + item.pm_projid = ll_i2info(dir)->lli_projid; + item.pm_name = &dentry->d_name; + dataset = pcc_dataset_match_get(&sbi->ll_pcc_super, + &item); + pca.pca_dataset = dataset; + } } it->it_create_mode = (mode & S_IALLUGO) | S_IFREG; it->it_flags = (open_flags & ~O_ACCMODE) | OPEN_FMODE(open_flags); it->it_flags &= ~MDS_OPEN_FL_INTERNAL; /* Dentry added to dcache tree in ll_lookup_it */ - de = ll_lookup_it(dir, dentry, it, &secctx, &secctxlen); + de = ll_lookup_it(dir, dentry, it, &secctx, &secctxlen, &pca); if (IS_ERR(de)) rc = PTR_ERR(de); else if (de != NULL) @@ -905,9 +1041,19 @@ static int ll_atomic_open(struct inode *dir, struct dentry *dentry, dput(de); goto out_release; } - - *opened |= FILE_CREATED; + if (dataset != NULL && dentry->d_inode) { + rc = pcc_inode_create_fini(dataset, + dentry->d_inode, + pca.pca_dentry); + if (rc) { + if (de != NULL) + dput(de); + GOTO(out_release, rc); + } + } + ll_set_created(opened, file); } + if (dentry->d_inode && it_disposition(it, DISP_OPEN_OPEN)) { /* Open dentry. */ if (S_ISFIFO(dentry->d_inode->i_mode)) { @@ -917,7 +1063,7 @@ static int ll_atomic_open(struct inode *dir, struct dentry *dentry, rc = finish_no_open(file, de); } else { file->private_data = it; - rc = finish_open(file, dentry, NULL, opened); + rc = ll_finish_open(file, dentry, opened); /* We dget in ll_splice_alias. finish_open takes * care of dget for fd open. */ @@ -930,6 +1076,8 @@ static int ll_atomic_open(struct inode *dir, struct dentry *dentry, } out_release: + if (dataset != NULL) + pcc_dataset_put(dataset); ll_intent_release(it); OBD_FREE(it, sizeof(*it)); @@ -989,12 +1137,12 @@ static struct dentry *ll_lookup_nd(struct inode *parent, struct dentry *dentry, it = ll_convert_intent(&nd->intent.open, nd->flags, (nd->path.mnt->mnt_flags & MNT_READONLY) || - (nd->path.mnt->mnt_sb->s_flags & MS_RDONLY)); + (nd->path.mnt->mnt_sb->s_flags & SB_RDONLY)); if (IS_ERR(it)) RETURN((struct dentry *)it); } - de = ll_lookup_it(parent, dentry, it, NULL, NULL); + de = ll_lookup_it(parent, dentry, it, NULL, NULL, NULL); if (de) dentry = de; if ((nd->flags & LOOKUP_OPEN) && !IS_ERR(dentry)) { /* Open */ @@ -1034,7 +1182,7 @@ static struct dentry *ll_lookup_nd(struct inode *parent, struct dentry *dentry, OBD_FREE(it, sizeof(*it)); } } else { - de = ll_lookup_it(parent, dentry, NULL, NULL, NULL); + de = ll_lookup_it(parent, dentry, NULL, NULL, NULL, NULL); } RETURN(de); @@ -1093,6 +1241,7 @@ static int ll_create_it(struct inode *dir, struct dentry *dentry, void *secctx, __u32 secctxlen) { struct inode *inode; + __u64 bits = 0; int rc = 0; ENTRY; @@ -1128,6 +1277,10 @@ static int ll_create_it(struct inode *dir, struct dentry *dentry, RETURN(rc); } + ll_set_lock_data(ll_i2sbi(dir)->ll_md_exp, inode, it, &bits); + if (bits & MDS_INODELOCK_LOOKUP) + d_lustre_revalidate(dentry); + RETURN(0); } @@ -1138,16 +1291,17 @@ void ll_update_times(struct ptlrpc_request *request, struct inode *inode) LASSERT(body); if (body->mbo_valid & OBD_MD_FLMTIME && - body->mbo_mtime > LTIME_S(inode->i_mtime)) { - CDEBUG(D_INODE, "setting fid "DFID" mtime from %lu to %llu" - "\n", PFID(ll_inode2fid(inode)), - LTIME_S(inode->i_mtime), body->mbo_mtime); - LTIME_S(inode->i_mtime) = body->mbo_mtime; + body->mbo_mtime > inode->i_mtime.tv_sec) { + CDEBUG(D_INODE, + "setting fid " DFID " mtime from %lld to %llu\n", + PFID(ll_inode2fid(inode)), + (s64)inode->i_mtime.tv_sec, body->mbo_mtime); + inode->i_mtime.tv_sec = body->mbo_mtime; } if (body->mbo_valid & OBD_MD_FLCTIME && - body->mbo_ctime > LTIME_S(inode->i_ctime)) - LTIME_S(inode->i_ctime) = body->mbo_ctime; + body->mbo_ctime > inode->i_ctime.tv_sec) + inode->i_ctime.tv_sec = body->mbo_ctime; } static int ll_new_node(struct inode *dir, struct dentry *dchild, @@ -1184,13 +1338,11 @@ again: from_kuid(&init_user_ns, current_fsuid()), from_kgid(&init_user_ns, current_fsgid()), cfs_curproc_cap_pack(), rdev, &request); - if (err < 0 && err != -EREMOTE) - GOTO(err_exit, err); - - /* If the client doesn't know where to create a subdirectory (or - * in case of a race that sends the RPC to the wrong MDS), the - * MDS will return -EREMOTE and the client will fetch the layout - * of the directory, then create the directory on the right MDT. */ +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 14, 58, 0) + /* + * server < 2.12.58 doesn't pack default LMV in intent_getattr reply, + * fetch default LMV here. + */ if (unlikely(err == -EREMOTE)) { struct ll_inode_info *lli = ll_i2info(dir); struct lmv_user_md *lum; @@ -1202,24 +1354,54 @@ again: err2 = ll_dir_getstripe(dir, (void **)&lum, &lumsize, &request, OBD_MD_DEFAULT_MEA); + ll_finish_md_op_data(op_data); + op_data = NULL; if (err2 == 0) { - /* Update stripe_offset and retry */ - lli->lli_def_stripe_offset = lum->lum_stripe_offset; - } else if (err2 == -ENODATA && - lli->lli_def_stripe_offset != -1) { - /* If there are no default stripe EA on the MDT, but the + struct lustre_md md = { NULL }; + + md.body = req_capsule_server_get(&request->rq_pill, + &RMF_MDT_BODY); + if (!md.body) + GOTO(err_exit, err = -EPROTO); + + OBD_ALLOC_PTR(md.default_lmv); + if (!md.default_lmv) + GOTO(err_exit, err = -ENOMEM); + + md.default_lmv->lsm_md_magic = lum->lum_magic; + md.default_lmv->lsm_md_stripe_count = + lum->lum_stripe_count; + md.default_lmv->lsm_md_master_mdt_index = + lum->lum_stripe_offset; + md.default_lmv->lsm_md_hash_type = lum->lum_hash_type; + + err = ll_update_inode(dir, &md); + md_free_lustre_md(sbi->ll_md_exp, &md); + if (err) + GOTO(err_exit, err); + } else if (err2 == -ENODATA && lli->lli_default_lsm_md) { + /* + * If there are no default stripe EA on the MDT, but the * client has default stripe, then it probably means - * default stripe EA has just been deleted. */ - lli->lli_def_stripe_offset = -1; + * default stripe EA has just been deleted. + */ + down_write(&lli->lli_lsm_sem); + if (lli->lli_default_lsm_md) + OBD_FREE_PTR(lli->lli_default_lsm_md); + lli->lli_default_lsm_md = NULL; + up_write(&lli->lli_lsm_sem); } else { GOTO(err_exit, err); } ptlrpc_req_finished(request); request = NULL; - ll_finish_md_op_data(op_data); goto again; } +#endif + + if (err < 0) + GOTO(err_exit, err); ll_update_times(request, dir); @@ -1266,37 +1448,38 @@ static int ll_mknod(struct inode *dir, struct dentry *dchild, ll_umode_t mode, { struct qstr *name = &dchild->d_name; int err; - ENTRY; + ENTRY; CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s, dir="DFID"(%p) mode %o dev %x\n", name->len, name->name, PFID(ll_inode2fid(dir)), dir, - mode, rdev); + mode, rdev); if (!IS_POSIXACL(dir) || !exp_connect_umask(ll_i2mdexp(dir))) mode &= ~current_umask(); - switch (mode & S_IFMT) { - case 0: - mode |= S_IFREG; /* for mode = 0 case, fallthrough */ - case S_IFREG: - case S_IFCHR: - case S_IFBLK: - case S_IFIFO: - case S_IFSOCK: + switch (mode & S_IFMT) { + case 0: + mode |= S_IFREG; + /* fallthrough */ + case S_IFREG: + case S_IFCHR: + case S_IFBLK: + case S_IFIFO: + case S_IFSOCK: err = ll_new_node(dir, dchild, NULL, mode, old_encode_dev(rdev), LUSTRE_OPC_MKNOD); - break; - case S_IFDIR: - err = -EPERM; - break; - default: - err = -EINVAL; - } + break; + case S_IFDIR: + err = -EPERM; + break; + default: + err = -EINVAL; + } - if (!err) - ll_stats_ops_tally(ll_i2sbi(dir), LPROC_LL_MKNOD, 1); + if (!err) + ll_stats_ops_tally(ll_i2sbi(dir), LPROC_LL_MKNOD, 1); - RETURN(err); + RETURN(err); } #ifdef HAVE_IOP_ATOMIC_OPEN