X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftarget%2Fout_handler.c;h=7dc9d4299956129aaed7a481b2096869d804615a;hb=d614ff561cb6bd9a9b35310c99dd991c55797d97;hp=4e2a25878b6c257d457dd8dbf2c3f6586735e0da;hpb=e1745ed18d8e28f3cf3d72df3b7ef50d83f36601;p=fs%2Flustre-release.git

diff --git a/lustre/target/out_handler.c b/lustre/target/out_handler.c
index 4e2a258..7dc9d42 100644
--- a/lustre/target/out_handler.c
+++ b/lustre/target/out_handler.c
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2013, 2015, Intel Corporation.
+ * Copyright (c) 2013, 2017, Intel Corporation.
  *
  * lustre/target/out_handler.c
  *
@@ -32,12 +32,21 @@
 #define DEBUG_SUBSYSTEM S_CLASS
 
 #include <llog_swab.h>
+#include <lustre_obdo.h>
 #include <lustre_swab.h>
 #include <lustre_update.h>
 #include <md_object.h>
 #include <obd_class.h>
 #include "tgt_internal.h"
 
+static inline void orr_cpu_to_le(struct out_read_reply *orr_dst,
+				 const struct out_read_reply *orr_src)
+{
+	orr_dst->orr_size = cpu_to_le32(orr_src->orr_size);
+	orr_dst->orr_padding = cpu_to_le32(orr_src->orr_padding);
+	orr_dst->orr_offset = cpu_to_le64(orr_dst->orr_offset);
+}
+
 static void out_reconstruct(const struct lu_env *env, struct dt_device *dt,
 			    struct dt_object *obj,
 			    struct object_update_reply *reply,
@@ -81,13 +90,12 @@ static inline int out_check_resent(const struct lu_env *env,
 		lustre_msg_set_transno(req->rq_repmsg, req->rq_transno);
 		lustre_msg_set_status(req->rq_repmsg, req->rq_status);
 
-		DEBUG_REQ(D_RPCTRACE, req, "restoring transno "LPD64"status %d",
-			  req->rq_transno, req->rq_status);
+		DEBUG_REQ(D_RPCTRACE, req, "restoring resent RPC");
 
 		reconstruct(env, dt, obj, reply, index);
 		return 1;
 	}
-	DEBUG_REQ(D_HA, req, "no reply for RESENT req (have "LPD64")",
+	DEBUG_REQ(D_HA, req, "no reply for RESENT req (have %lld)",
 		 req->rq_export->exp_target_data.ted_lcd->lcd_last_xid);
 	return 0;
 }
@@ -111,7 +119,7 @@ static int out_create(struct tgt_session_info *tsi)
 	if (IS_ERR(wobdo) || size != sizeof(*wobdo)) {
 		CERROR("%s: obdo is NULL, invalid RPC: rc = %ld\n",
 		       tgt_name(tsi->tsi_tgt), PTR_ERR(wobdo));
-		RETURN(err_serious(PTR_ERR(wobdo)));
+		RETURN(PTR_ERR(wobdo));
 	}
 
 	if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
@@ -125,14 +133,14 @@ static int out_create(struct tgt_session_info *tsi)
 		if (IS_ERR(fid) || size != sizeof(*fid)) {
 			CERROR("%s: invalid fid: rc = %ld\n",
 			       tgt_name(tsi->tsi_tgt), PTR_ERR(fid));
-			RETURN(err_serious(PTR_ERR(fid)));
+			RETURN(PTR_ERR(fid));
 		}
 		if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
 			lustre_swab_lu_fid(fid);
 		if (!fid_is_sane(fid)) {
 			CERROR("%s: invalid fid "DFID": rc = %d\n",
 			       tgt_name(tsi->tsi_tgt), PFID(fid), -EPROTO);
-			RETURN(err_serious(-EPROTO));
+			RETURN(-EPROTO);
 		}
 	}
 
@@ -164,7 +172,7 @@ static int out_attr_set(struct tgt_session_info *tsi)
 	if (IS_ERR(wobdo) || size != sizeof(*wobdo)) {
 		CERROR("%s: empty obdo in the update: rc = %ld\n",
 		       tgt_name(tsi->tsi_tgt), PTR_ERR(wobdo));
-		RETURN(err_serious(PTR_ERR(wobdo)));
+		RETURN(PTR_ERR(wobdo));
 	}
 
 	attr->la_valid = 0;
@@ -216,7 +224,6 @@ static int out_attr_get(struct tgt_session_info *tsi)
 
 	obdo->o_valid = 0;
 	obdo_from_la(obdo, la, la->la_valid);
-	lustre_set_wire_obdo(NULL, obdo, obdo);
 
 out_unlock:
 	dt_read_unlock(env, obj);
@@ -256,28 +263,35 @@ static int out_xattr_get(struct tgt_session_info *tsi)
 	if (IS_ERR(name)) {
 		CERROR("%s: empty name for xattr get: rc = %ld\n",
 		       tgt_name(tsi->tsi_tgt), PTR_ERR(name));
-		RETURN(err_serious(PTR_ERR(name)));
+		RETURN(PTR_ERR(name));
 	}
 
-	update_result = object_update_result_get(reply, 0, NULL);
+	update_result = object_update_result_get(reply, idx, NULL);
 	if (update_result == NULL) {
 		CERROR("%s: empty name for xattr get: rc = %d\n",
 		       tgt_name(tsi->tsi_tgt), -EPROTO);
-		RETURN(err_serious(-EPROTO));
+		RETURN(-EPROTO);
 	}
 
 	lbuf->lb_len = (int)tti->tti_u.update.tti_update->ou_result_size;
-	lbuf->lb_buf = update_result->our_data;
 	if (lbuf->lb_len == 0)
-		lbuf->lb_buf = 0;
+		lbuf->lb_buf = NULL;
+	else
+		lbuf->lb_buf = update_result->our_data;
+
 	dt_read_lock(env, obj, MOR_TGT_CHILD);
 	rc = dt_xattr_get(env, obj, lbuf, name);
 	dt_read_unlock(env, obj);
-	if (rc < 0)
+	if (rc <= 0) {
 		lbuf->lb_len = 0;
+		if (unlikely(!rc))
+			rc = -ENODATA;
+	} else if (lbuf->lb_buf) {
+		lbuf->lb_len = rc;
+	}
 	CDEBUG(D_INFO, "%s: "DFID" get xattr %s len %d\n",
 	       tgt_name(tsi->tsi_tgt), PFID(lu_object_fid(&obj->do_lu)),
-	       name, (int)lbuf->lb_len);
+	       name, rc);
 
 	GOTO(out, rc);
 
@@ -286,6 +300,59 @@ out:
 	RETURN(0);
 }
 
+static int out_xattr_list(struct tgt_session_info *tsi)
+{
+	const struct lu_env *env = tsi->tsi_env;
+	struct tgt_thread_info *tti = tgt_th_info(env);
+	struct lu_buf *lbuf = &tti->tti_buf;
+	struct object_update_reply *reply = tti->tti_u.update.tti_update_reply;
+	struct dt_object *obj = tti->tti_u.update.tti_dt_object;
+	struct object_update_result *update_result;
+	int idx = tti->tti_u.update.tti_update_reply_index;
+	int rc;
+
+	ENTRY;
+
+	if (!lu_object_exists(&obj->do_lu)) {
+		set_bit(LU_OBJECT_HEARD_BANSHEE,
+			&obj->do_lu.lo_header->loh_flags);
+		RETURN(-ENOENT);
+	}
+
+	update_result = object_update_result_get(reply, 0, NULL);
+	if (!update_result) {
+		rc = -EPROTO;
+		CERROR("%s: empty buf for xattr list: rc = %d\n",
+		       tgt_name(tsi->tsi_tgt), rc);
+		RETURN(rc);
+	}
+
+	lbuf->lb_len = (int)tti->tti_u.update.tti_update->ou_result_size;
+	lbuf->lb_buf = update_result->our_data;
+	if (lbuf->lb_len == 0)
+		lbuf->lb_buf = 0;
+
+	dt_read_lock(env, obj, MOR_TGT_CHILD);
+	rc = dt_xattr_list(env, obj, lbuf);
+	dt_read_unlock(env, obj);
+	if (rc <= 0) {
+		lbuf->lb_len = 0;
+		if (unlikely(!rc))
+			rc = -ENODATA;
+	} else if (lbuf->lb_buf) {
+		lbuf->lb_len = rc;
+	}
+
+	CDEBUG(D_INFO, "%s: "DFID" list xattr len %d\n",
+	       tgt_name(tsi->tsi_tgt), PFID(lu_object_fid(&obj->do_lu)), rc);
+
+	/* Since we directly use update_result->our_data as the lbuf->lb_buf,
+	 * then use NULL for result_insert to avoid unnecessary memory copy. */
+	object_update_result_insert(reply, NULL, lbuf->lb_len, idx, rc);
+
+	RETURN(0);
+}
+
 static int out_index_lookup(struct tgt_session_info *tsi)
 {
 	const struct lu_env	*env = tsi->tsi_env;
@@ -307,7 +374,7 @@ static int out_index_lookup(struct tgt_session_info *tsi)
 	if (IS_ERR(name)) {
 		CERROR("%s: empty name for lookup: rc = %ld\n",
 		       tgt_name(tsi->tsi_tgt), PTR_ERR(name));
-		RETURN(err_serious(PTR_ERR(name)));
+		RETURN(PTR_ERR(name));
 	}
 
 	dt_read_lock(env, obj, MOR_TGT_CHILD);
@@ -359,13 +426,13 @@ static int out_xattr_set(struct tgt_session_info *tsi)
 	if (IS_ERR(name)) {
 		CERROR("%s: empty name for xattr set: rc = %ld\n",
 		       tgt_name(tsi->tsi_tgt), PTR_ERR(name));
-		RETURN(err_serious(PTR_ERR(name)));
+		RETURN(PTR_ERR(name));
 	}
 
 	/* If buffer == NULL (-ENODATA), then it might mean delete xattr */
 	buf = object_update_param_get(update, 1, &buf_len);
 	if (IS_ERR(buf) && PTR_ERR(buf) != -ENODATA)
-		RETURN(err_serious(PTR_ERR(buf)));
+		RETURN(PTR_ERR(buf));
 
 	lbuf->lb_buf = buf;
 	lbuf->lb_len = buf_len;
@@ -374,7 +441,7 @@ static int out_xattr_set(struct tgt_session_info *tsi)
 	if (IS_ERR(tmp) || size != sizeof(*tmp)) {
 		CERROR("%s: emptry or wrong size %zu flag: rc = %ld\n",
 		       tgt_name(tsi->tsi_tgt), size, PTR_ERR(tmp));
-		RETURN(err_serious(PTR_ERR(tmp)));
+		RETURN(PTR_ERR(tmp));
 	}
 
 	if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
@@ -401,7 +468,7 @@ static int out_xattr_del(struct tgt_session_info *tsi)
 	if (IS_ERR(name)) {
 		CERROR("%s: empty name for xattr set: rc = %ld\n",
 		       tgt_name(tsi->tsi_tgt), PTR_ERR(name));
-		RETURN(err_serious(PTR_ERR(name)));
+		RETURN(PTR_ERR(name));
 	}
 
 	rc = out_tx_xattr_del(tsi->tsi_env, obj, name, &tti->tti_tea,
@@ -464,14 +531,14 @@ static int out_index_insert(struct tgt_session_info *tsi)
 	if (IS_ERR(name)) {
 		CERROR("%s: empty name for index insert: rc = %ld\n",
 		       tgt_name(tsi->tsi_tgt), PTR_ERR(name));
-		RETURN(err_serious(PTR_ERR(name)));
+		RETURN(PTR_ERR(name));
 	}
 
 	fid = object_update_param_get(update, 1, &size);
 	if (IS_ERR(fid) || size != sizeof(*fid)) {
 		CERROR("%s: invalid fid: rc = %ld\n",
 		       tgt_name(tsi->tsi_tgt), PTR_ERR(fid));
-		RETURN(err_serious(PTR_ERR(fid)));
+		RETURN(PTR_ERR(fid));
 	}
 
 	if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
@@ -480,14 +547,14 @@ static int out_index_insert(struct tgt_session_info *tsi)
 	if (!fid_is_sane(fid)) {
 		CERROR("%s: invalid FID "DFID": rc = %d\n",
 		       tgt_name(tsi->tsi_tgt), PFID(fid), -EPROTO);
-		RETURN(err_serious(-EPROTO));
+		RETURN(-EPROTO);
 	}
 
 	ptype = object_update_param_get(update, 2, &size);
 	if (IS_ERR(ptype) || size != sizeof(*ptype)) {
 		CERROR("%s: invalid type for index insert: rc = %ld\n",
 		       tgt_name(tsi->tsi_tgt), PTR_ERR(ptype));
-		RETURN(err_serious(PTR_ERR(ptype)));
+		RETURN(PTR_ERR(ptype));
 	}
 
 	if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
@@ -519,7 +586,7 @@ static int out_index_delete(struct tgt_session_info *tsi)
 	if (IS_ERR(name)) {
 		CERROR("%s: empty name for index delete: rc = %ld\n",
 		       tgt_name(tsi->tsi_tgt), PTR_ERR(name));
-		RETURN(err_serious(PTR_ERR(name)));
+		RETURN(PTR_ERR(name));
 	}
 
 	rc = out_tx_index_delete(tsi->tsi_env, obj, (const struct dt_key *)name,
@@ -542,7 +609,7 @@ static int out_destroy(struct tgt_session_info *tsi)
 	if (!fid_is_sane(fid)) {
 		CERROR("%s: invalid FID "DFID": rc = %d\n",
 		       tgt_name(tsi->tsi_tgt), PFID(fid), -EPROTO);
-		RETURN(err_serious(-EPROTO));
+		RETURN(-EPROTO);
 	}
 
 	if (!lu_object_exists(&obj->do_lu))
@@ -574,7 +641,7 @@ static int out_write(struct tgt_session_info *tsi)
 	if (IS_ERR(buf) || buf_len == 0) {
 		CERROR("%s: empty buf for xattr set: rc = %ld\n",
 		       tgt_name(tsi->tsi_tgt), PTR_ERR(buf));
-		RETURN(err_serious(PTR_ERR(buf)));
+		RETURN(PTR_ERR(buf));
 	}
 	lbuf->lb_buf = buf;
 	lbuf->lb_len = buf_len;
@@ -583,7 +650,7 @@ static int out_write(struct tgt_session_info *tsi)
 	if (IS_ERR(tmp) || size != sizeof(*tmp)) {
 		CERROR("%s: empty or wrong size %zu pos: rc = %ld\n",
 		       tgt_name(tsi->tsi_tgt), size, PTR_ERR(tmp));
-		RETURN(err_serious(PTR_ERR(tmp)));
+		RETURN(PTR_ERR(tmp));
 	}
 
 	if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
@@ -628,7 +695,7 @@ static int out_read(struct tgt_session_info *tsi)
 	if (IS_ERR(tmp)) {
 		CERROR("%s: empty size for read: rc = %ld\n",
 		       tgt_name(tsi->tsi_tgt), PTR_ERR(tmp));
-		GOTO(out, rc = err_serious(PTR_ERR(tmp)));
+		GOTO(out, rc = PTR_ERR(tmp));
 	}
 	size = le64_to_cpu(*(size_t *)(tmp));
 
@@ -636,7 +703,7 @@ static int out_read(struct tgt_session_info *tsi)
 	if (IS_ERR(tmp)) {
 		CERROR("%s: empty pos for read: rc = %ld\n",
 		       tgt_name(tsi->tsi_tgt), PTR_ERR(tmp));
-		GOTO(out, rc = err_serious(PTR_ERR(tmp)));
+		GOTO(out, rc = PTR_ERR(tmp));
 	}
 	pos = le64_to_cpu(*(__u64 *)(tmp));
 
@@ -744,6 +811,8 @@ static struct tgt_handler out_update_ops[] = {
 	DEF_OUT_HNDL(OUT_WRITE, "out_write", MUTABOR | HABEO_REFERO, out_write),
 	DEF_OUT_HNDL(OUT_READ, "out_read", HABEO_REFERO, out_read),
 	DEF_OUT_HNDL(OUT_NOOP, "out_noop", HABEO_REFERO, out_noop),
+	DEF_OUT_HNDL(OUT_XATTR_LIST, "out_xattr_list", HABEO_REFERO,
+		     out_xattr_list),
 };
 
 static struct tgt_handler *out_handler_find(__u32 opc)
@@ -797,17 +866,7 @@ static int out_trans_stop(const struct lu_env *env,
 	rc = dt_trans_stop(env, ta->ta_handle->th_dev, ta->ta_handle);
 	for (i = 0; i < ta->ta_argno; i++) {
 		if (ta->ta_args[i]->object != NULL) {
-			struct dt_object *obj = ta->ta_args[i]->object;
-
-			/* If the object is being created during this
-			 * transaction, we need to remove them from the
-			 * cache immediately, because a few layers are
-			 * missing in OUT handler, i.e. the object might
-			 * not be initialized in all layers */
-			if (ta->ta_args[i]->exec_fn == out_tx_create_exec)
-				set_bit(LU_OBJECT_HEARD_BANSHEE,
-					&obj->do_lu.lo_header->loh_flags);
-			lu_object_put(env, &ta->ta_args[i]->object->do_lu);
+			dt_object_put(env, ta->ta_args[i]->object);
 			ta->ta_args[i]->object = NULL;
 		}
 	}
@@ -937,7 +996,7 @@ int out_handle(struct tgt_session_info *tsi)
 
 	OBD_ALLOC(update_bufs, sizeof(*update_bufs) * update_buf_count);
 	if (update_bufs == NULL)
-		RETURN(-ENOMEM);
+		RETURN(err_serious(-ENOMEM));
 
 	if (ouh->ouh_inline_length > 0) {
 		update_bufs[0] = ouh->ouh_inline_data;
@@ -955,16 +1014,16 @@ int out_handle(struct tgt_session_info *tsi)
 					    MDS_BULK_PORTAL,
 					    &ptlrpc_bulk_kvec_ops);
 		if (desc == NULL)
-			GOTO(out_free, rc = -ENOMEM);
+			GOTO(out_free, rc = err_serious(-ENOMEM));
 
 		tmp = oub;
 		for (i = 0; i < update_buf_count; i++, tmp++) {
 			if (tmp->oub_size >= OUT_MAXREQSIZE)
 				GOTO(out_free, rc = err_serious(-EPROTO));
 
-			OBD_ALLOC(update_bufs[i], tmp->oub_size);
+			OBD_ALLOC_LARGE(update_bufs[i], tmp->oub_size);
 			if (update_bufs[i] == NULL)
-				GOTO(out_free, rc = -ENOMEM);
+				GOTO(out_free, rc = err_serious(-ENOMEM));
 
 			desc->bd_frag_ops->add_iov_frag(desc, update_bufs[i],
 							tmp->oub_size);
@@ -973,11 +1032,11 @@ int out_handle(struct tgt_session_info *tsi)
 		pill->rc_req->rq_bulk_write = 1;
 		rc = sptlrpc_svc_prep_bulk(pill->rc_req, desc);
 		if (rc != 0)
-			GOTO(out_free, err_serious(rc));
+			GOTO(out_free, rc = err_serious(rc));
 
 		rc = target_bulk_io(pill->rc_req->rq_export, desc, &lwi);
 		if (rc < 0)
-			GOTO(out_free, err_serious(rc));
+			GOTO(out_free, rc = err_serious(rc));
 	}
 	/* validate the request and calculate the total update count and
 	 * set it to reply */
@@ -996,7 +1055,7 @@ int out_handle(struct tgt_session_info *tsi)
 			       " expect %x: rc = %d\n",
 			       tgt_name(tsi->tsi_tgt), our->ourq_magic,
 			       UPDATE_REQUEST_MAGIC, -EPROTO);
-			GOTO(out_free, rc = -EPROTO);
+			GOTO(out_free, rc = err_serious(-EPROTO));
 		}
 		updates += our->ourq_count;
 
@@ -1004,7 +1063,7 @@ int out_handle(struct tgt_session_info *tsi)
 		for (j = 0; j < our->ourq_count; j++) {
 			update = object_update_request_get(our, j, NULL);
 			if (update == NULL)
-				GOTO(out, rc = -EPROTO);
+				GOTO(out, rc = err_serious(-EPROTO));
 			if (ptlrpc_req_need_swab(pill->rc_req))
 				lustre_swab_object_update(update);
 
@@ -1028,7 +1087,7 @@ int out_handle(struct tgt_session_info *tsi)
 		CERROR("%s: too small reply buf %u for %u, need %u at least\n",
 		       tgt_name(tsi->tsi_tgt), ouh->ouh_reply_size,
 		       updates, reply_size);
-		GOTO(out_free, rc = -EPROTO);
+		GOTO(out_free, rc = err_serious(-EPROTO));
 	}
 
 	req_capsule_set_size(pill, &RMF_OUT_UPDATE_REPLY, RCL_SERVER,
@@ -1037,18 +1096,18 @@ int out_handle(struct tgt_session_info *tsi)
 	if (rc != 0) {
 		CERROR("%s: Can't pack response: rc = %d\n",
 		       tgt_name(tsi->tsi_tgt), rc);
-		GOTO(out_free, rc = -EPROTO);
+		GOTO(out_free, rc = err_serious(-EPROTO));
 	}
 
 	/* Prepare the update reply buffer */
 	reply = req_capsule_server_get(pill, &RMF_OUT_UPDATE_REPLY);
 	if (reply == NULL)
-		GOTO(out_free, rc = err_serious(-EPROTO));
+		GOTO(out_free, rc = -EPROTO);
 	reply->ourp_magic = UPDATE_REPLY_MAGIC;
 	reply->ourp_count = updates;
 	tti->tti_u.update.tti_update_reply = reply;
 	tti->tti_mult_trans = !req_is_replay(tgt_ses_req(tsi));
- 
+
 	/* Walk through updates in the request to execute them */
 	for (i = 0; i < update_buf_count; i++) {
 		struct tgt_handler	*h;
@@ -1060,19 +1119,27 @@ int out_handle(struct tgt_session_info *tsi)
 		our = update_bufs[i];
 		update_count = our->ourq_count;
 		for (j = 0; j < update_count; j++) {
+			struct lu_object_conf conf;
+
 			update = object_update_request_get(our, j, NULL);
+			if (update->ou_type == OUT_CREATE)
+				conf.loc_flags = LOC_F_NEW;
+			else
+				conf.loc_flags = 0;
 
-			dt_obj = dt_locate(env, dt, &update->ou_fid);
+			dt_obj = dt_locate_at(env, dt, &update->ou_fid,
+				dt->dd_lu_dev.ld_site->ls_top_dev, &conf);
 			if (IS_ERR(dt_obj))
 				GOTO(out, rc = PTR_ERR(dt_obj));
 
 			if (dt->dd_record_fid_accessed) {
-				lfsck_pack_rfa(&tti->tti_lr,
+				struct lfsck_req_local *lrl = &tti->tti_lrl;
+
+				lfsck_pack_rfa(lrl,
 					       lu_object_fid(&dt_obj->do_lu),
-					       LE_FID_ACCESSED,
+					       LEL_FID_ACCESSED,
 					       LFSCK_TYPE_LAYOUT);
-				tgt_lfsck_in_notify(env, dt, &tti->tti_lr,
-						    NULL);
+				tgt_lfsck_in_notify_local(env, dt, lrl, NULL);
 			}
 
 			tti->tti_u.update.tti_dt_object = dt_obj;
@@ -1094,6 +1161,9 @@ int out_handle(struct tgt_session_info *tsi)
 						     out_reconstruct, reply,
 						     reply_index))
 					GOTO(next, rc = 0);
+
+				if (dt->dd_rdonly)
+					GOTO(next, rc = -EROFS);
 			}
 
 			/* start transaction for modification RPC only */
@@ -1132,7 +1202,7 @@ int out_handle(struct tgt_session_info *tsi)
 			rc = h->th_act(tsi);
 next:
 			reply_index++;
-			lu_object_put(env, &dt_obj->do_lu);
+			dt_object_put(env, dt_obj);
 			if (rc < 0)
 				GOTO(out, rc);
 		}
@@ -1149,7 +1219,8 @@ out_free:
 		if (oub != NULL) {
 			for (i = 0; i < update_buf_count; i++, oub++) {
 				if (update_bufs[i] != NULL)
-					OBD_FREE(update_bufs[i], oub->oub_size);
+					OBD_FREE_LARGE(update_bufs[i],
+						       oub->oub_size);
 			}
 		}