X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Fofd_dlm.c;h=6ed8fafacc65a0d5ce5e086b147dc727ea45757c;hb=784cd144103871bd421c139c09bfbf4d5d29ca08;hp=1f67141c4f942920aa95decf79b0b2a61697d12d;hpb=0ea96fbfac0c5f4c6846d84360f53733198f95dd;p=fs%2Flustre-release.git

diff --git a/lustre/ofd/ofd_dlm.c b/lustre/ofd/ofd_dlm.c
index 1f67141..6ed8faf 100644
--- a/lustre/ofd/ofd_dlm.c
+++ b/lustre/ofd/ofd_dlm.c
@@ -88,7 +88,7 @@ static enum interval_iter ofd_intent_cb(struct interval_node *n, void *args)
 }
 
 int ofd_intent_policy(struct ldlm_namespace *ns, struct ldlm_lock **lockp,
-		      void *req_cookie, ldlm_mode_t mode, int flags,
+		      void *req_cookie, ldlm_mode_t mode, __u64 flags,
 		      void *data)
 {
 	struct ptlrpc_request		*req = req_cookie;
@@ -98,8 +98,8 @@ int ofd_intent_policy(struct ldlm_namespace *ns, struct ldlm_lock **lockp,
 	struct ost_lvb			*res_lvb, *reply_lvb;
 	struct ldlm_reply		*rep;
 	ldlm_error_t			 err;
-	int				 idx, rc;
-	int				 tmpflags = 0, only_liblustre = 1;
+	int				 idx, rc, only_liblustre = 1;
+	__u64				 tmpflags = 0;
 	struct ldlm_interval_tree	*tree;
 	struct ofd_intent_args		 arg;
 	__u32				 repsize[3] = {
@@ -111,6 +111,7 @@ int ofd_intent_policy(struct ldlm_namespace *ns, struct ldlm_lock **lockp,
 	CFS_LIST_HEAD(gl_list);
 	ENTRY;
 
+	lock->l_lvb_type = LVB_T_OST;
 	policy = ldlm_get_processing_policy(res);
 	LASSERT(policy != NULL);
 	LASSERT(req != NULL);