X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_dir.c;h=97fef8927cfe0ddc7299aa9c6a6083832a699d61;hb=f95393b0d0a59cf3dc2f29cffc35dcc4cc9d7728;hp=f5bfade389bcb8fbd093200dffda4f927b3fcfe7;hpb=5d61648b99997406ae897c076c0d3eb1ca84a0db;p=fs%2Flustre-release.git diff --git a/lustre/mdd/mdd_dir.c b/lustre/mdd/mdd_dir.c index f5bfade..97fef89 100644 --- a/lustre/mdd/mdd_dir.c +++ b/lustre/mdd/mdd_dir.c @@ -26,7 +26,7 @@ * 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. */ /* @@ -46,14 +46,21 @@ #define DEBUG_SUBSYSTEM S_MDS #include +#ifdef HAVE_EXT4_LDISKFS +#include +#else #include +#endif #include #include #include #include #include - +#ifdef HAVE_EXT4_LDISKFS +#include +#else #include +#endif #include #include #include @@ -196,9 +203,8 @@ out: * * returns < 0: if error */ -static int mdd_is_subdir(const struct lu_env *env, - struct md_object *mo, const struct lu_fid *fid, - struct lu_fid *sfid) +int mdd_is_subdir(const struct lu_env *env, struct md_object *mo, + const struct lu_fid *fid, struct lu_fid *sfid) { struct mdd_device *mdd = mdo2mdd(mo); int rc; @@ -551,7 +557,7 @@ static int __mdd_index_insert_only(const struct lu_env *env, struct md_ucred *uc = md_ucred(env); rc = next->do_index_ops->dio_insert(env, next, - __mdd_fid_rec(env, lf), + (struct dt_rec*)lf, (const struct dt_key *)name, handle, capa, uc->mu_cap & CFS_CAP_SYS_RESOURCE_MASK); @@ -641,13 +647,13 @@ static int mdd_changelog_ns_store(const struct lu_env *env, RETURN(-ENOMEM); rec = (struct llog_changelog_rec *)buf->lb_buf; - rec->cr_flags = CLF_VERSION; - rec->cr_type = (__u32)type; + rec->cr.cr_flags = CLF_VERSION; + rec->cr.cr_type = (__u32)type; tfid = tf ? tf : mdo2fid(target); - rec->cr_tfid = *tfid; - rec->cr_pfid = *tpfid; - rec->cr_namelen = tname->ln_namelen; - memcpy(rec->cr_name, tname->ln_name, rec->cr_namelen); + rec->cr.cr_tfid = *tfid; + rec->cr.cr_pfid = *tpfid; + rec->cr.cr_namelen = tname->ln_namelen; + memcpy(rec->cr.cr_name, tname->ln_name, rec->cr.cr_namelen); if (likely(target)) target->mod_cltime = cfs_time_current_64(); @@ -674,6 +680,7 @@ static int mdd_link(const struct lu_env *env, struct md_object *tgt_obj, struct thandle *handle; #ifdef HAVE_QUOTA_SUPPORT struct obd_device *obd = mdd->mdd_obd_dev; + struct obd_export *exp = md_quota(env)->mq_exp; struct mds_obd *mds = &obd->u.mds; unsigned int qids[MAXQUOTAS] = { 0, 0 }; int quota_opc = 0, rec_pending[MAXQUOTAS] = { 0, 0 }; @@ -692,7 +699,7 @@ static int mdd_link(const struct lu_env *env, struct md_object *tgt_obj, quota_opc = FSFILT_OP_LINK; mdd_quota_wrapper(la_tmp, qids); /* get block quota for parent */ - lquota_chkquota(mds_quota_interface_ref, obd, + lquota_chkquota(mds_quota_interface_ref, obd, exp, qids, rec_pending, 1, NULL, LQUOTA_FLAGS_BLK, data, 1); } @@ -766,23 +773,27 @@ int mdd_finish_unlink(const struct lu_env *env, int reset = 1; ENTRY; + LASSERT(mdd_write_locked(env, obj) != 0); + rc = mdd_iattr_get(env, obj, ma); if (rc == 0 && ma->ma_attr.la_nlink == 0) { + obj->mod_flags |= DEAD_OBJ; /* add new orphan and the object * will be deleted during mdd_close() */ if (obj->mod_count) { rc = __mdd_orphan_add(env, obj, th); - if (rc == 0) { - obj->mod_flags |= ORPHAN_OBJ; - CDEBUG(D_HA, "Object "DFID" is going to be " - "an orphan, open count = %d\n", + if (rc == 0) + CDEBUG(D_HA, "Object "DFID" is inserted into " + "orphan list, open count = %d\n", PFID(mdd_object_fid(obj)), obj->mod_count); - } - } - - obj->mod_flags |= DEAD_OBJ; - if (!(obj->mod_flags & ORPHAN_OBJ)) { + else + CERROR("Object "DFID" fail to be an orphan, " + "open count = %d, maybe cause failed " + "open replay\n", + PFID(mdd_object_fid(obj)), + obj->mod_count); + } else { rc = mdd_object_kill(env, obj, ma); if (rc == 0) reset = 0; @@ -893,11 +904,6 @@ static int mdd_unlink(const struct lu_env *env, struct md_object *pobj, } } #endif - - if (rc == 0) - obd_set_info_async(mdd2obd_dev(mdd)->u.mds.mds_osc_exp, - sizeof(KEY_UNLINKED), KEY_UNLINKED, 0, - NULL, NULL); if (!is_dir) /* old files may not have link ea; ignore errors */ mdd_links_rename(env, mdd_cobj, mdo2fid(mdd_pobj), @@ -961,6 +967,7 @@ static int mdd_name_insert(const struct lu_env *env, #ifdef HAVE_QUOTA_SUPPORT struct md_ucred *uc = md_ucred(env); struct obd_device *obd = mdd->mdd_obd_dev; + struct obd_export *exp = md_quota(env)->mq_exp; struct mds_obd *mds = &obd->u.mds; unsigned int qids[MAXQUOTAS] = { 0, 0 }; int quota_opc = 0, rec_pending[MAXQUOTAS] = { 0, 0 }; @@ -982,7 +989,7 @@ static int mdd_name_insert(const struct lu_env *env, mdd_quota_wrapper(la_tmp, qids); /* get block quota for parent */ lquota_chkquota(mds_quota_interface_ref, obd, - qids, rec_pending, 1, NULL, + exp, qids, rec_pending, 1, NULL, LQUOTA_FLAGS_BLK, data, 1); } } else { @@ -1184,6 +1191,7 @@ static int mdd_rename_tgt(const struct lu_env *env, struct thandle *handle; #ifdef HAVE_QUOTA_SUPPORT struct obd_device *obd = mdd->mdd_obd_dev; + struct obd_export *exp = md_quota(env)->mq_exp; struct mds_obd *mds = &obd->u.mds; unsigned int qcids[MAXQUOTAS] = { 0, 0 }; unsigned int qpids[MAXQUOTAS] = { 0, 0 }; @@ -1204,7 +1212,7 @@ static int mdd_rename_tgt(const struct lu_env *env, quota_popc = FSFILT_OP_LINK; mdd_quota_wrapper(la_tmp, qpids); /* get block quota for target parent */ - lquota_chkquota(mds_quota_interface_ref, obd, + lquota_chkquota(mds_quota_interface_ref, obd, exp, qpids, rec_pending, 1, NULL, LQUOTA_FLAGS_BLK, data, 1); } @@ -1395,7 +1403,6 @@ __mdd_lookup(const struct lu_env *env, struct md_object *pobj, struct mdd_object *mdd_obj = md2mdd_obj(pobj); struct mdd_device *m = mdo2mdd(pobj); struct dt_object *dir = mdd_object_child(mdd_obj); - struct lu_fid_pack *pack = &mdd_env_info(env)->mti_pack; int rc; ENTRY; @@ -1424,10 +1431,10 @@ __mdd_lookup(const struct lu_env *env, struct md_object *pobj, dt_try_as_dir(env, dir))) { rc = dir->do_index_ops->dio_lookup(env, dir, - (struct dt_rec *)pack, key, + (struct dt_rec *)fid, key, mdd_object_capa(env, mdd_obj)); if (rc > 0) - rc = fid_unpack(pack, fid); + rc = 0; else if (rc == 0) rc = -ENOENT; } else @@ -1461,20 +1468,12 @@ int mdd_object_initialize(const struct lu_env *env, const struct lu_fid *pfid, __mdd_ref_add(env, child, handle); rc = __mdd_index_insert_only(env, child, mdo2fid(child), dot, handle, BYPASS_CAPA); - if (rc == 0) { + if (rc == 0) rc = __mdd_index_insert_only(env, child, pfid, dotdot, handle, BYPASS_CAPA); - if (rc != 0) { - int rc2; - - rc2 = __mdd_index_delete(env, child, dot, 1, - handle, BYPASS_CAPA); - if (rc2 != 0) - CERROR("Failure to cleanup after dotdot" - " creation: %d (%d)\n", rc2, rc); - } - } + if (rc != 0) + __mdd_ref_del(env, child, handle, 1); } if (rc == 0) mdd_links_add(env, child, pfid, lname, handle); @@ -1591,6 +1590,7 @@ static int mdd_create(const struct lu_env *env, int got_def_acl = 0; #ifdef HAVE_QUOTA_SUPPORT struct obd_device *obd = mdd->mdd_obd_dev; + struct obd_export *exp = md_quota(env)->mq_exp; struct mds_obd *mds = &obd->u.mds; unsigned int qcids[MAXQUOTAS] = { 0, 0 }; unsigned int qpids[MAXQUOTAS] = { 0, 0 }; @@ -1654,8 +1654,9 @@ static int mdd_create(const struct lu_env *env, mdd_quota_wrapper(&ma->ma_attr, qcids); mdd_quota_wrapper(la_tmp, qpids); /* get file quota for child */ - lquota_chkquota(mds_quota_interface_ref, obd, qcids, - inode_pending, 1, NULL, 0, NULL, 0); + lquota_chkquota(mds_quota_interface_ref, obd, exp, + qcids, inode_pending, 1, NULL, 0, NULL, + 0); switch (ma->ma_attr.la_mode & S_IFMT) { case S_IFLNK: case S_IFDIR: @@ -1673,13 +1674,14 @@ static int mdd_create(const struct lu_env *env, /* get block quota for child and parent */ if (block_count) lquota_chkquota(mds_quota_interface_ref, obd, - qcids, block_pending, + exp, qcids, block_pending, block_count, NULL, LQUOTA_FLAGS_BLK, NULL, 0); if (!same) lquota_chkquota(mds_quota_interface_ref, obd, - qpids, parent_pending, 1, NULL, - LQUOTA_FLAGS_BLK, NULL, 0); + exp, qpids, parent_pending, 1, + NULL, LQUOTA_FLAGS_BLK, NULL, + 0); } } #endif @@ -1971,6 +1973,7 @@ static int mdd_rename(const struct lu_env *env, #ifdef HAVE_QUOTA_SUPPORT struct obd_device *obd = mdd->mdd_obd_dev; + struct obd_export *exp = md_quota(env)->mq_exp; struct mds_obd *mds = &obd->u.mds; unsigned int qspids[MAXQUOTAS] = { 0, 0 }; unsigned int qtcids[MAXQUOTAS] = { 0, 0 }; @@ -2003,7 +2006,7 @@ static int mdd_rename(const struct lu_env *env, mdd_quota_wrapper(la_tmp, qtpids); /* get block quota for target parent */ lquota_chkquota(mds_quota_interface_ref, - obd, qtpids, + obd, exp, qtpids, rec_pending, 1, NULL, LQUOTA_FLAGS_BLK, data, 1); @@ -2055,7 +2058,7 @@ static int mdd_rename(const struct lu_env *env, GOTO(cleanup, rc); /* "mv dir1 dir2" needs "dir1/.." link update */ - if (is_dir && mdd_sobj) { + if (is_dir && mdd_sobj && !lu_fid_eq(spobj_fid, tpobj_fid)) { rc = __mdd_index_delete_only(env, mdd_sobj, dotdot, handle, mdd_object_capa(env, mdd_sobj)); if (rc) @@ -2063,9 +2066,8 @@ static int mdd_rename(const struct lu_env *env, rc = __mdd_index_insert_only(env, mdd_sobj, tpobj_fid, dotdot, handle, mdd_object_capa(env, mdd_sobj)); - if (rc) { + if (rc) GOTO(fixup_spobj, rc); - } } /* Remove target name from target directory @@ -2276,8 +2278,7 @@ struct lu_buf *mdd_links_get(const struct lu_env *env, rc = mdo_xattr_get(env, mdd_obj, buf, XATTR_NAME_LINK, capa); if (rc == -ERANGE) { /* Buf was too small, figure out what we need. */ - buf->lb_buf = NULL; - buf->lb_len = 0; + mdd_buf_put(buf); rc = mdo_xattr_get(env, mdd_obj, buf, XATTR_NAME_LINK, capa); if (rc < 0) return ERR_PTR(rc); @@ -2307,20 +2308,19 @@ struct lu_buf *mdd_links_get(const struct lu_env *env, /** Pack a link_ea_entry. * All elements are stored as chars to avoid alignment issues. * Numbers are always big-endian - * \param packbuf is a temp fid buffer * \retval record length */ static int mdd_lee_pack(struct link_ea_entry *lee, const struct lu_name *lname, - const struct lu_fid *pfid, struct lu_fid* packbuf) + const struct lu_fid *pfid) { - char *ptr; - int reclen; + struct lu_fid tmpfid; + int reclen; + + fid_cpu_to_be(&tmpfid, pfid); + memcpy(&lee->lee_parent_fid, &tmpfid, sizeof(tmpfid)); + memcpy(lee->lee_name, lname->ln_name, lname->ln_namelen); + reclen = sizeof(struct link_ea_entry) + lname->ln_namelen; - fid_pack(&lee->lee_parent_fid, pfid, packbuf); - ptr = (char *)&lee->lee_parent_fid + lee->lee_parent_fid.fp_len; - strncpy(ptr, lname->ln_name, lname->ln_namelen); - reclen = lee->lee_parent_fid.fp_len + lname->ln_namelen + - sizeof(lee->lee_reclen); lee->lee_reclen[0] = (reclen >> 8) & 0xff; lee->lee_reclen[1] = reclen & 0xff; return reclen; @@ -2330,11 +2330,10 @@ void mdd_lee_unpack(const struct link_ea_entry *lee, int *reclen, struct lu_name *lname, struct lu_fid *pfid) { *reclen = (lee->lee_reclen[0] << 8) | lee->lee_reclen[1]; - fid_unpack(&lee->lee_parent_fid, pfid); - lname->ln_name = (char *)&lee->lee_parent_fid + - lee->lee_parent_fid.fp_len; - lname->ln_namelen = *reclen - lee->lee_parent_fid.fp_len - - sizeof(lee->lee_reclen); + memcpy(pfid, &lee->lee_parent_fid, sizeof(*pfid)); + fid_be_to_cpu(pfid, pfid); + lname->ln_name = lee->lee_name; + lname->ln_namelen = *reclen - sizeof(struct link_ea_entry); } /** Add a record to the end of link ea buf */ @@ -2359,7 +2358,7 @@ static int __mdd_links_add(const struct lu_env *env, struct lu_buf *buf, leh = buf->lb_buf; lee = buf->lb_buf + leh->leh_len; - reclen = mdd_lee_pack(lee, lname, pfid, &mdd_env_info(env)->mti_fid2); + reclen = mdd_lee_pack(lee, lname, pfid); leh->leh_len += reclen; leh->leh_reccount++; return 0; @@ -2415,9 +2414,14 @@ static int mdd_links_add(const struct lu_env *env, rc = __mdd_xattr_set(env, mdd_obj, mdd_buf_get_const(env, buf->lb_buf, leh->leh_len), XATTR_NAME_LINK, 0, handle); - if (rc) - CERROR("link_ea add failed %d "DFID"\n", rc, - PFID(mdd_object_fid(mdd_obj))); + if (rc) { + if (rc == -ENOSPC) + CDEBUG(D_INODE, "link_ea add failed %d "DFID"\n", rc, + PFID(mdd_object_fid(mdd_obj))); + else + CERROR("link_ea add failed %d "DFID"\n", rc, + PFID(mdd_object_fid(mdd_obj))); + } if (buf->lb_vmalloc) /* if we vmalloced a large buffer drop it */ @@ -2454,15 +2458,19 @@ static int mdd_links_rename(const struct lu_env *env, buf = mdd_links_get(env, mdd_obj); if (IS_ERR(buf)) { rc = PTR_ERR(buf); - CERROR("link_ea read failed %d "DFID"\n", - rc, PFID(mdd_object_fid(mdd_obj))); + if (rc == -ENODATA) + CDEBUG(D_INODE, "link_ea read failed %d "DFID"\n", + rc, PFID(mdd_object_fid(mdd_obj))); + else + CERROR("link_ea read failed %d "DFID"\n", + rc, PFID(mdd_object_fid(mdd_obj))); RETURN(rc); } leh = buf->lb_buf; lee = (struct link_ea_entry *)(leh + 1); /* link #0 */ /* Find the old record */ - for(count = 0; count <= leh->leh_reccount; count++) { + for(count = 0; count < leh->leh_reccount; count++) { mdd_lee_unpack(lee, &reclen, tmpname, tmpfid); if (tmpname->ln_namelen == oldlname->ln_namelen && lu_fid_eq(tmpfid, oldpfid) && @@ -2471,7 +2479,7 @@ static int mdd_links_rename(const struct lu_env *env, break; lee = (struct link_ea_entry *)((char *)lee + reclen); } - if (count > leh->leh_reccount) { + if ((count + 1) > leh->leh_reccount) { CDEBUG(D_INODE, "Old link_ea name '%.*s' not found\n", oldlname->ln_namelen, oldlname->ln_name); GOTO(out, rc = -ENOENT);