X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdc%2Fmdc_dev.c;h=563187e376dce6b3ec4ffb0c01cfd29e820d9f10;hp=bd67c30434a9e6afac1badabc2d402274060b3db;hb=bab7c8998a6539c0d5e054f9a5fd4ecb2a6d9c56;hpb=7e781c605c4189ea1f4b0a343863280ebeb237d4

diff --git a/lustre/mdc/mdc_dev.c b/lustre/mdc/mdc_dev.c
index bd67c30..563187e 100644
--- a/lustre/mdc/mdc_dev.c
+++ b/lustre/mdc/mdc_dev.c
@@ -1025,8 +1025,9 @@ static int mdc_get_lock_handle(const struct lu_env *env, struct osc_object *osc,
 
 		resname = &osc_env_info(env)->oti_resname;
 		fid_build_reg_res_name(lu_object_fid(osc2lu(osc)), resname);
-		res = ldlm_resource_get(osc_export(osc)->exp_obd->obd_namespace,
-					NULL, resname, LDLM_IBITS, 0);
+		res = ldlm_resource_get(osc_export(osc)->
+							exp_obd->obd_namespace,
+					resname, LDLM_IBITS, 0);
 		if (IS_ERR(res))
 			CERROR("No lock resource for "DFID"\n",
 				PFID(lu_object_fid(osc2lu(osc))));
@@ -1290,6 +1291,7 @@ static int mdc_io_data_version_start(const struct lu_env *env,
 
 	req_capsule_set_size(&req->rq_pill, &RMF_ACL, RCL_SERVER, 0);
 	req_capsule_set_size(&req->rq_pill, &RMF_MDT_MD, RCL_SERVER, 0);
+	req_capsule_set_size(&req->rq_pill, &RMF_FILE_ENCCTX, RCL_SERVER, 0);
 	ptlrpc_request_set_replen(req);
 
 	req->rq_interpret_reply = mdc_data_version_interpret;