b=18127

[fs/lustre-release.git] / lustre / mdd / mdd_trans.c

diff --git a/lustre/mdd/mdd_trans.c b/lustre/mdd/mdd_trans.c
index ac39324..947ef75 100644 (file)
--- a/lustre/mdd/mdd_trans.c
+++ b/lustre/mdd/mdd_trans.c
@@ -16,8 +16,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
@@ -121,7 +121,10 @@ int mdd_log_txn_param_build(const struct lu_env *env, struct md_object *obj,
         if (rc || !(ma->ma_valid & MA_LOV))
                 RETURN(rc);
 
-        LASSERT(le32_to_cpu(ma->ma_lmm->lmm_magic) == LOV_MAGIC);
+        LASSERTF(le32_to_cpu(ma->ma_lmm->lmm_magic) == LOV_MAGIC_V1 ||
+                 le32_to_cpu(ma->ma_lmm->lmm_magic) == LOV_MAGIC_V3,
+                 "%08x", le32_to_cpu(ma->ma_lmm->lmm_magic));
+
         if ((int)le32_to_cpu(ma->ma_lmm->lmm_stripe_count) < 0)
                 stripe = mdd2obd_dev(mdd)->u.mds.mds_lov_desc.ld_tgt_count;
         else
@@ -132,6 +135,20 @@ int mdd_log_txn_param_build(const struct lu_env *env, struct md_object *obj,
         RETURN(rc);
 }
 
+int mdd_setattr_txn_param_build(const struct lu_env *env, struct md_object *obj,
+                                struct md_attr *ma, enum mdd_txn_op op)
+{
+        struct mdd_device *mdd = mdo2mdd(&md2mdd_obj(obj)->mod_obj);
+        ENTRY;
+
+        mdd_txn_param_build(env, mdd, op);
+        if (ma->ma_attr.la_valid & (LA_UID | LA_GID))
+                mdd_env_info(env)->mti_param.tp_credits =
+                                        dto_txn_credits[DTO_ATTR_SET_CHOWN];
+
+        RETURN(0);
+}
+
 static void mdd_txn_init_dto_credits(const struct lu_env *env,
                                      struct mdd_device *mdd, int *dto_credits)
 {
@@ -158,16 +175,18 @@ int mdd_txn_init_credits(const struct lu_env *env, struct mdd_device *mdd)
                 mdd->mdd_tod[op].mod_op = op;
                 switch(op) {
                         case MDD_TXN_OBJECT_DESTROY_OP:
+                                /* Unused now */
                                 *c = dt[DTO_OBJECT_DELETE];
                                 break;
                         case MDD_TXN_OBJECT_CREATE_OP:
-                                /* OI_INSERT + CREATE OBJECT */
+                                /* OI INSERT + CREATE OBJECT */
                                 *c = dt[DTO_INDEX_INSERT] +
-                                        dt[DTO_OBJECT_CREATE];
+                                     dt[DTO_OBJECT_CREATE];
                                 break;
                         case MDD_TXN_ATTR_SET_OP:
                                 /* ATTR set + XATTR(lsm, lmv) set */
-                                *c = dt[DTO_ATTR_SET] + dt[DTO_XATTR_SET];
+                                *c = dt[DTO_ATTR_SET_BASE] +
+                                     dt[DTO_XATTR_SET];
                                 break;
                         case MDD_TXN_XATTR_SET_OP:
                                 *c = dt[DTO_XATTR_SET];
@@ -182,18 +201,28 @@ int mdd_txn_init_credits(const struct lu_env *env, struct mdd_device *mdd)
                                 *c = dt[DTO_INDEX_INSERT];
                                 break;
                         case MDD_TXN_UNLINK_OP:
-                                /* delete index + Unlink log */
-                                *c = dt[DTO_INDEX_DELETE];
+                                /* delete index + Unlink log +
+                                 * mdd orphan handling */
+                                *c = dt[DTO_INDEX_DELETE] +
+                                        dt[DTO_INDEX_DELETE] +
+                                        dt[DTO_INDEX_INSERT] * 2 +
+                                        dt[DTO_XATTR_SET] * 3;
                                 break;
                         case MDD_TXN_RENAME_OP:
                                 /* 2 delete index + 1 insert + Unlink log */
                                 *c = 2 * dt[DTO_INDEX_DELETE] +
-                                        dt[DTO_INDEX_INSERT];
+                                        dt[DTO_INDEX_INSERT] +
+                                        dt[DTO_INDEX_DELETE] +
+                                        dt[DTO_INDEX_INSERT] * 2 +
+                                        dt[DTO_XATTR_SET] * 3;
                                 break;
                         case MDD_TXN_RENAME_TGT_OP:
                                 /* index insert + index delete */
                                 *c = dt[DTO_INDEX_DELETE] +
-                                     dt[DTO_INDEX_INSERT];
+                                        dt[DTO_INDEX_INSERT] +
+                                        dt[DTO_INDEX_DELETE] +
+                                        dt[DTO_INDEX_INSERT] * 2 +
+                                        dt[DTO_XATTR_SET] * 3;
                                 break;
                         case MDD_TXN_CREATE_DATA_OP:
                                 /* same as set xattr(lsm) */
@@ -206,7 +235,7 @@ int mdd_txn_init_credits(const struct lu_env *env, struct mdd_device *mdd)
                                  * CREATE_OBJECT CREDITS
                                  */
                                  *c = 2 * dt[DTO_INDEX_INSERT] +
-                                         dt[DTO_OBJECT_CREATE];
+                                          dt[DTO_OBJECT_CREATE];
                                 break;
                         default:
                                 CERROR("Invalid op %d init its credit\n", op);