X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fdt_object.h;h=fdd45bda5cd672552e616e7b0346940d44f36943;hb=a933a4ceaa4bdf6fd458571d053ccb0794e31928;hp=b1fbda0531e1bea5ba63196eca03638b5c0a02a8;hpb=0810df383cc006f8a06adbd3c262367bd9d9472a;p=fs%2Flustre-release.git

diff --git a/lustre/include/dt_object.h b/lustre/include/dt_object.h
index b1fbda0..fdd45bd 100644
--- a/lustre/include/dt_object.h
+++ b/lustre/include/dt_object.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -67,6 +67,7 @@ struct dt_object;
 struct dt_index_features;
 struct niobuf_local;
 struct niobuf_remote;
+struct ldlm_enqueue_info;
 
 typedef enum {
         MNTOPT_USERXATTR        = 0x00000001,
@@ -212,6 +213,7 @@ enum dt_index_flags {
  */
 extern const struct dt_index_features dt_directory_features;
 extern const struct dt_index_features dt_otable_features;
+extern const struct dt_index_features dt_lfsck_features;
 
 /* index features supported by the accounting objects */
 extern const struct dt_index_features dt_acct_features;
@@ -524,6 +526,12 @@ struct dt_body_operations {
                           struct lustre_capa *capa);
 };
 
+struct dt_lock_operations {
+	int (*do_object_lock)(const struct lu_env *env, struct dt_object *dt,
+			      struct lustre_handle *lh,
+			      struct ldlm_enqueue_info *einfo,
+			      void *policy);
+};
 /**
  * Incomplete type of index record.
  */
@@ -667,6 +675,7 @@ struct dt_object {
         const struct dt_object_operations *do_ops;
         const struct dt_body_operations   *do_body_ops;
         const struct dt_index_operations  *do_index_ops;
+	const struct dt_lock_operations   *do_lock_ops;
 };
 
 /*
@@ -682,7 +691,7 @@ struct local_oid_storage {
 	struct dt_object *los_obj;
 
 	/* data used to generate new fids */
-	cfs_mutex_t	  los_id_lock;
+	struct mutex	 los_id_lock;
 	__u64		  los_seq;
 	__u32		  los_last_oid;
 };
@@ -703,6 +712,17 @@ static inline int dt_object_exists(const struct dt_object *dt)
         return lu_object_exists(&dt->do_lu);
 }
 
+static inline int dt_object_remote(const struct dt_object *dt)
+{
+	return lu_object_remote(&dt->do_lu);
+}
+
+static inline struct dt_object *lu2dt_obj(struct lu_object *o)
+{
+	LASSERT(ergo(o != NULL, lu_device_is_dt(o->lo_dev)));
+	return container_of0(o, struct dt_object, do_lu);
+}
+
 /**
  * This is the general purpose transaction handle.
  * 1. Transaction Life Cycle
@@ -718,24 +738,32 @@ static inline int dt_object_exists(const struct dt_object *dt)
  *      No RPC request should be issued inside transaction.
  */
 struct thandle {
-        /** the dt device on which the transactions are executed */
-        struct dt_device *th_dev;
+	/** the dt device on which the transactions are executed */
+	struct dt_device *th_dev;
 
-        /** additional tags (layers can add in declare) */
-        __u32             th_tags;
+	/** context for this transaction, tag is LCT_TX_HANDLE */
+	struct lu_context th_ctx;
 
-        /** context for this transaction, tag is LCT_TX_HANDLE */
-        struct lu_context th_ctx;
+	/** additional tags (layers can add in declare) */
+	__u32             th_tags;
 
-        /** the last operation result in this transaction.
-         * this value is used in recovery */
-        __s32             th_result;
+	/** the last operation result in this transaction.
+	 * this value is used in recovery */
+	__s32             th_result;
 
-        /** whether we need sync commit */
-        int               th_sync:1;
+	/** whether we need sync commit */
+	unsigned int		th_sync:1;
 
-        /* local transation, no need to inform other layers */
-        int               th_local:1;
+	/* local transation, no need to inform other layers */
+	unsigned int		th_local:1;
+
+	/* In DNE, one transaction can be disassemblied into
+	 * updates on several different MDTs, and these updates
+	 * will be attached to th_remote_update_list per target.
+	 * Only single thread will access the list, no need lock
+	 */
+	cfs_list_t		th_remote_update_list;
+	struct update_request	*th_current_request;
 };
 
 /**
@@ -784,6 +812,10 @@ int dt_path_parser(const struct lu_env *env,
                    char *local, dt_entry_func_t entry_func,
                    void *data);
 
+struct dt_object *
+dt_store_resolve(const struct lu_env *env, struct dt_device *dt,
+		 const char *path, struct lu_fid *fid);
+
 struct dt_object *dt_store_open(const struct lu_env *env,
                                 struct dt_device *dt,
                                 const char *dirname,
@@ -851,6 +883,17 @@ local_index_find_or_create_with_fid(const struct lu_env *env,
 				    const char *name, __u32 mode,
 				    const struct dt_index_features *ft);
 
+static inline int dt_object_lock(const struct lu_env *env,
+				 struct dt_object *o, struct lustre_handle *lh,
+				 struct ldlm_enqueue_info *einfo,
+				 void *policy)
+{
+	LASSERT(o);
+	LASSERT(o->do_lock_ops);
+	LASSERT(o->do_lock_ops->do_object_lock);
+	return o->do_lock_ops->do_object_lock(env, o, lh, einfo, policy);
+}
+
 int dt_lookup_dir(const struct lu_env *env, struct dt_object *dir,
 		  const char *name, struct lu_fid *fid);