From: Andreas Dilger <andreas.dilger@intel.com>
Date: Thu, 8 Jan 2015 19:47:52 +0000 (-0700)
Subject: LU-5319 mdt: pass __u64 for storing opdata
X-Git-Tag: 2.7.52~37
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=6cad330ded9c6ff21b35229139b7f60fbbfe80c6

LU-5319 mdt: pass __u64 for storing opdata

While lcd_last_data is only __u32, the internal disposition handling
is done with __u64, so it doesn't makes sense to drop the high bits in
mdt_get_disposition(), mdt_set_disposition(), mdt_clear_disposition().

Minor whitespace and prototype cleanups.

Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Change-Id: Ia4880b7256564a6799f8c686fd8690ebbf3ebbe5
Reviewed-on: http://review.whamcloud.com/13297
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Grégoire Pichon <gregoire.pichon@bull.net>
Reviewed-by: Patrick Farrell <paf@cray.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index cf82eb0..a0af42e 100644
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -128,33 +128,33 @@ static struct lu_kmem_descr mdt_caches[] = {
 	}
 };
 
-int mdt_get_disposition(struct ldlm_reply *rep, int flag)
+__u64 mdt_get_disposition(struct ldlm_reply *rep, __u64 op_flag)
 {
-        if (!rep)
-                return 0;
-        return (rep->lock_policy_res1 & flag);
+	if (!rep)
+		return 0;
+	return rep->lock_policy_res1 & op_flag;
 }
 
 void mdt_clear_disposition(struct mdt_thread_info *info,
-			   struct ldlm_reply *rep, int flag)
+			   struct ldlm_reply *rep, __u64 op_flag)
 {
 	if (info) {
-		info->mti_opdata &= ~flag;
-		tgt_opdata_clear(info->mti_env, flag);
+		info->mti_opdata &= ~op_flag;
+		tgt_opdata_clear(info->mti_env, op_flag);
 	}
 	if (rep)
-		rep->lock_policy_res1 &= ~flag;
+		rep->lock_policy_res1 &= ~op_flag;
 }
 
 void mdt_set_disposition(struct mdt_thread_info *info,
-			 struct ldlm_reply *rep, int flag)
+			 struct ldlm_reply *rep, __u64 op_flag)
 {
 	if (info) {
-		info->mti_opdata |= flag;
-		tgt_opdata_set(info->mti_env, flag);
+		info->mti_opdata |= op_flag;
+		tgt_opdata_set(info->mti_env, op_flag);
 	}
 	if (rep)
-		rep->lock_policy_res1 |= flag;
+		rep->lock_policy_res1 |= op_flag;
 }
 
 void mdt_lock_reg_init(struct mdt_lock_handle *lh, ldlm_mode_t lm)
diff --git a/lustre/mdt/mdt_internal.h b/lustre/mdt/mdt_internal.h
index d0deb78..ddbe9d4 100644
--- a/lustre/mdt/mdt_internal.h
+++ b/lustre/mdt/mdt_internal.h
@@ -584,43 +584,33 @@ static inline bool mdt_is_striped_client(struct obd_export *exp)
 	return exp_connect_flags(exp) & OBD_CONNECT_DIR_STRIPE;
 }
 
-int mdt_get_disposition(struct ldlm_reply *rep, int flag);
+__u64 mdt_get_disposition(struct ldlm_reply *rep, __u64 op_flag);
 void mdt_set_disposition(struct mdt_thread_info *info,
-                        struct ldlm_reply *rep, int flag);
+			 struct ldlm_reply *rep, __u64 op_flag);
 void mdt_clear_disposition(struct mdt_thread_info *info,
-                        struct ldlm_reply *rep, int flag);
+			   struct ldlm_reply *rep, __u64 op_flag);
 
-void mdt_lock_pdo_init(struct mdt_lock_handle *lh,
-		       ldlm_mode_t lock_mode,
+void mdt_lock_pdo_init(struct mdt_lock_handle *lh, ldlm_mode_t lock_mode,
 		       const struct lu_name *lname);
 
-void mdt_lock_reg_init(struct mdt_lock_handle *lh,
-                       ldlm_mode_t lm);
+void mdt_lock_reg_init(struct mdt_lock_handle *lh, ldlm_mode_t lm);
 
-int mdt_lock_setup(struct mdt_thread_info *info,
-                   struct mdt_object *o,
-                   struct mdt_lock_handle *lh);
+int mdt_lock_setup(struct mdt_thread_info *info, struct mdt_object *mo,
+		   struct mdt_lock_handle *lh);
 
-int mdt_check_resent_lock(struct mdt_thread_info *info,
-			  struct mdt_object *mo,
+int mdt_check_resent_lock(struct mdt_thread_info *info, struct mdt_object *mo,
 			  struct mdt_lock_handle *lhc);
 
-int mdt_object_lock(struct mdt_thread_info *,
-                    struct mdt_object *,
-                    struct mdt_lock_handle *,
-                    __u64, int);
+int mdt_object_lock(struct mdt_thread_info *info, struct mdt_object *mo,
+		    struct mdt_lock_handle *lh, __u64 ibits, int locality);
 
-int mdt_object_lock_try(struct mdt_thread_info *,
-			struct mdt_object *,
-			struct mdt_lock_handle *,
-			__u64, int);
+int mdt_object_lock_try(struct mdt_thread_info *info, struct mdt_object *mo,
+			struct mdt_lock_handle *lh, __u64 ibits, int locality);
 
-void mdt_object_unlock(struct mdt_thread_info *,
-                       struct mdt_object *,
-                       struct mdt_lock_handle *,
-                       int decref);
+void mdt_object_unlock(struct mdt_thread_info *info, struct mdt_object *mo,
+		       struct mdt_lock_handle *lh, int decref);
 
-struct mdt_object *mdt_object_new(const struct lu_env *,
+struct mdt_object *mdt_object_new(const struct lu_env *env,
 				  struct mdt_device *,
 				  const struct lu_fid *);
 struct mdt_object *mdt_object_find(const struct lu_env *,