X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Fofd_dev.c;h=6b9ea6e51d5967346243ae8defdb71ddf105e400;hb=refs%2Fchanges%2F31%2F20631%2F10;hp=48ac842aa96fe2d761b72d724f69c31007a184e3;hpb=14db26a85c52561d186b5c400981a0025d45864a;p=fs%2Flustre-release.git

diff --git a/lustre/ofd/ofd_dev.c b/lustre/ofd/ofd_dev.c
index 48ac842..6b9ea6e 100644
--- a/lustre/ofd/ofd_dev.c
+++ b/lustre/ofd/ofd_dev.c
@@ -1379,8 +1379,8 @@ out:
 		 * otherwise concurrent destroy can make the object unavailable
 		 * for 2nd lu_object_find() waiting for the first reference
 		 * to go... deadlock! */
-		res = ldlm_resource_get(ofd->ofd_namespace, NULL,
-					&tsi->tsi_resid, LDLM_EXTENT, 0);
+		res = ldlm_resource_get(ofd->ofd_namespace, &tsi->tsi_resid,
+					LDLM_EXTENT, 0);
 		if (!IS_ERR(res)) {
 			ldlm_res_lvbo_update(res, NULL, 0);
 			ldlm_resource_putref(res);
@@ -2071,8 +2071,7 @@ out:
 	if (srvlock)
 		tgt_data_unlock(&lh, LCK_PW);
 	if (rc == 0) {
-		res = ldlm_resource_get(ns, NULL, &tsi->tsi_resid,
-					LDLM_EXTENT, 0);
+		res = ldlm_resource_get(ns, &tsi->tsi_resid, LDLM_EXTENT, 0);
 		if (!IS_ERR(res)) {
 			struct ost_lvb *res_lvb;
 
@@ -2188,8 +2187,7 @@ out:
 		 * otherwise concurrent destroy can make the object unavailable
 		 * for 2nd lu_object_find() waiting for the first reference
 		 * to go... deadlock! */
-		res = ldlm_resource_get(ns, NULL, &tsi->tsi_resid,
-				        LDLM_EXTENT, 0);
+		res = ldlm_resource_get(ns, &tsi->tsi_resid, LDLM_EXTENT, 0);
 		if (!IS_ERR(res)) {
 			struct ost_lvb *res_lvb;