X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftarget%2Fout_handler.c;h=51bdd93e7babc0a6caa62347be990b88fd3e267a;hb=ed5ebb87bfc2b684958daac90c4369f395482a16;hp=40e5ce33308bf3aec50bb8f85793e06788774476;hpb=1a937b36bb212eb720d504f124d9b135975892d6;p=fs%2Flustre-release.git

diff --git a/lustre/target/out_handler.c b/lustre/target/out_handler.c
index 40e5ce3..51bdd93 100644
--- a/lustre/target/out_handler.c
+++ b/lustre/target/out_handler.c
@@ -81,7 +81,7 @@ out:
 #define TX_ALLOC_STEP	8
 static struct tx_arg *tx_add_exec(struct thandle_exec_args *ta,
 				  tx_exec_func_t func, tx_exec_func_t undo,
-				  char *file, int line)
+				  const char *file, int line)
 {
 	int rc;
 	int i;
@@ -210,7 +210,7 @@ static int __out_tx_create(const struct lu_env *env, struct dt_object *obj,
 			   struct dt_object_format *dof,
 			   struct thandle_exec_args *ta,
 			   struct object_update_reply *reply,
-			   int index, char *file, int line)
+			   int index, const char *file, int line)
 {
 	struct tx_arg *arg;
 	int rc;
@@ -250,7 +250,7 @@ static int out_create(struct tgt_session_info *tsi)
 	struct lu_attr		*attr = &tti->tti_attr;
 	struct lu_fid		*fid = NULL;
 	struct obdo		*wobdo;
-	int			size;
+	size_t			size;
 	int			rc;
 
 	ENTRY;
@@ -269,8 +269,6 @@ static int out_create(struct tgt_session_info *tsi)
 
 	dof->dof_type = dt_mode_to_dft(attr->la_mode);
 	if (update->ou_params_count > 1) {
-		int size;
-
 		fid = object_update_param_get(update, 1, &size);
 		if (fid == NULL || size != sizeof(*fid)) {
 			CERROR("%s: invalid fid: rc = %d\n",
@@ -333,7 +331,7 @@ static int __out_tx_attr_set(const struct lu_env *env,
 			     const struct lu_attr *attr,
 			     struct thandle_exec_args *th,
 			     struct object_update_reply *reply,
-			     int index, char *file, int line)
+			     int index, const char *file, int line)
 {
 	struct tx_arg	*arg;
 	int		rc;
@@ -364,7 +362,7 @@ static int out_attr_set(struct tgt_session_info *tsi)
 	struct dt_object        *obj = tti->tti_u.update.tti_dt_object;
 	struct obdo		*lobdo = &tti->tti_u.update.tti_obdo;
 	struct obdo		*wobdo;
-	int			 size;
+	size_t			 size;
 	int			 rc;
 
 	ENTRY;
@@ -417,42 +415,6 @@ static int out_attr_get(struct tgt_session_info *tsi)
 	rc = dt_attr_get(env, obj, la, NULL);
 	if (rc)
 		GOTO(out_unlock, rc);
-	/*
-	 * If it is a directory, we will also check whether the
-	 * directory is empty.
-	 * la_flags = 0 : Empty.
-	 *          = 1 : Not empty.
-	 */
-	la->la_flags = 0;
-	if (S_ISDIR(la->la_mode)) {
-		struct dt_it		*it;
-		const struct dt_it_ops	*iops;
-
-		if (!dt_try_as_dir(env, obj))
-			GOTO(out_unlock, rc = -ENOTDIR);
-
-		iops = &obj->do_index_ops->dio_it;
-		it = iops->init(env, obj, LUDA_64BITHASH, BYPASS_CAPA);
-		if (!IS_ERR(it)) {
-			int  result;
-			result = iops->get(env, it, (const void *)"");
-			if (result > 0) {
-				int i;
-				for (result = 0, i = 0; result == 0 && i < 3;
-				     ++i)
-					result = iops->next(env, it);
-				if (result == 0)
-					la->la_flags = 1;
-			} else if (result == 0)
-				/*
-				 * Huh? Index contains no zero key?
-				 */
-				rc = -EIO;
-
-			iops->put(env, it);
-			iops->fini(env, it);
-		}
-	}
 
 	obdo->o_valid = 0;
 	obdo_from_la(obdo, la, la->la_valid);
@@ -624,7 +586,7 @@ static int __out_tx_xattr_set(const struct lu_env *env,
 			      const char *name, int flags,
 			      struct thandle_exec_args *ta,
 			      struct object_update_reply *reply,
-			      int index, char *file, int line)
+			      int index, const char *file, int line)
 {
 	struct tx_arg	*arg;
 	int		rc;
@@ -658,9 +620,9 @@ static int out_xattr_set(struct tgt_session_info *tsi)
 	char			*name;
 	char			*buf;
 	__u32			*tmp;
-	int			 buf_len = 0;
+	size_t			 buf_len = 0;
 	int			 flag;
-	int			 size = 0;
+	size_t			 size = 0;
 	int			 rc;
 	ENTRY;
 
@@ -683,7 +645,7 @@ static int out_xattr_set(struct tgt_session_info *tsi)
 
 	tmp = object_update_param_get(update, 2, &size);
 	if (tmp == NULL || size != sizeof(*tmp)) {
-		CERROR("%s: emptry or wrong size %d flag: rc = %d\n",
+		CERROR("%s: emptry or wrong size %zd flag: rc = %d\n",
 		       tgt_name(tsi->tsi_tgt), size, -EPROTO);
 		RETURN(err_serious(-EPROTO));
 	}
@@ -699,6 +661,79 @@ static int out_xattr_set(struct tgt_session_info *tsi)
 	RETURN(rc);
 }
 
+static int out_tx_xattr_del_exec(const struct lu_env *env, struct thandle *th,
+				 struct tx_arg *arg)
+{
+	struct dt_object *dt_obj = arg->object;
+	int rc;
+
+	CDEBUG(D_INFO, "%s: del xattr name '%s' on "DFID"\n",
+	       dt_obd_name(th->th_dev), arg->u.xattr_set.name,
+	       PFID(lu_object_fid(&dt_obj->do_lu)));
+
+	if (!lu_object_exists(&dt_obj->do_lu))
+		GOTO(out, rc = -ENOENT);
+
+	dt_write_lock(env, dt_obj, MOR_TGT_CHILD);
+	rc = dt_xattr_del(env, dt_obj, arg->u.xattr_set.name,
+			  th, NULL);
+	dt_write_unlock(env, dt_obj);
+out:
+	CDEBUG(D_INFO, "%s: insert xattr del reply %p index %d: rc = %d\n",
+	       dt_obd_name(th->th_dev), arg->reply, arg->index, rc);
+
+	object_update_result_insert(arg->reply, NULL, 0, arg->index, rc);
+
+	return rc;
+}
+
+static int __out_tx_xattr_del(const struct lu_env *env,
+			      struct dt_object *dt_obj, const char *name,
+			      struct thandle_exec_args *ta,
+			      struct object_update_reply *reply,
+			      int index, const char *file, int line)
+{
+	struct tx_arg	*arg;
+	int		rc;
+
+	rc = dt_declare_xattr_del(env, dt_obj, name, ta->ta_handle);
+	if (rc != 0)
+		return rc;
+
+	arg = tx_add_exec(ta, out_tx_xattr_del_exec, NULL, file, line);
+	if (IS_ERR(arg))
+		return PTR_ERR(arg);
+
+	lu_object_get(&dt_obj->do_lu);
+	arg->object = dt_obj;
+	arg->u.xattr_set.name = name;
+	arg->reply = reply;
+	arg->index = index;
+	return 0;
+}
+
+static int out_xattr_del(struct tgt_session_info *tsi)
+{
+	struct tgt_thread_info	*tti = tgt_th_info(tsi->tsi_env);
+	struct object_update	*update = tti->tti_u.update.tti_update;
+	struct dt_object	*obj = tti->tti_u.update.tti_dt_object;
+	char			*name;
+	int			 rc;
+	ENTRY;
+
+	name = object_update_param_get(update, 0, NULL);
+	if (name == NULL) {
+		CERROR("%s: empty name for xattr set: rc = %d\n",
+		       tgt_name(tsi->tsi_tgt), -EPROTO);
+		RETURN(err_serious(-EPROTO));
+	}
+
+	rc = out_tx_xattr_del(tsi->tsi_env, obj, name, &tti->tti_tea,
+			      tti->tti_u.update.tti_update_reply,
+			      tti->tti_u.update.tti_update_reply_index);
+	RETURN(rc);
+}
+
 static int out_obj_ref_add(const struct lu_env *env,
 			   struct dt_object *dt_obj,
 			   struct thandle *th)
@@ -750,7 +785,7 @@ static int __out_tx_ref_add(const struct lu_env *env,
 			    struct dt_object *dt_obj,
 			    struct thandle_exec_args *ta,
 			    struct object_update_reply *reply,
-			    int index, char *file, int line)
+			    int index, const char *file, int line)
 {
 	struct tx_arg	*arg;
 	int		rc;
@@ -815,7 +850,7 @@ static int __out_tx_ref_del(const struct lu_env *env,
 			    struct dt_object *dt_obj,
 			    struct thandle_exec_args *ta,
 			    struct object_update_reply *reply,
-			    int index, char *file, int line)
+			    int index, const char *file, int line)
 {
 	struct tx_arg	*arg;
 	int		rc;
@@ -862,9 +897,10 @@ static int out_obj_index_insert(const struct lu_env *env,
 {
 	int rc;
 
-	CDEBUG(D_INFO, "%s: index insert "DFID" name: %s fid "DFID"\n",
+	CDEBUG(D_INFO, "%s: index insert "DFID" name: %s fid "DFID", type %u\n",
 	       dt_obd_name(th->th_dev), PFID(lu_object_fid(&dt_obj->do_lu)),
-	       (char *)key, PFID((struct lu_fid *)rec));
+	       (char *)key, PFID(((struct dt_insert_rec *)rec)->rec_fid),
+	       ((struct dt_insert_rec *)rec)->rec_type);
 
 	if (dt_try_as_dir(env, dt_obj) == 0)
 		return -ENOTDIR;
@@ -903,7 +939,8 @@ static int out_tx_index_insert_exec(const struct lu_env *env,
 	struct dt_object *dt_obj = arg->object;
 	int rc;
 
-	rc = out_obj_index_insert(env, dt_obj, arg->u.insert.rec,
+	rc = out_obj_index_insert(env, dt_obj,
+				  (const struct dt_rec *)&arg->u.insert.rec,
 				  arg->u.insert.key, th);
 
 	CDEBUG(D_INFO, "%s: insert idx insert reply %p index %d: rc = %d\n",
@@ -922,10 +959,11 @@ static int out_tx_index_insert_undo(const struct lu_env *env,
 
 static int __out_tx_index_insert(const struct lu_env *env,
 				 struct dt_object *dt_obj,
-				 char *name, struct lu_fid *fid,
+				 const struct dt_rec *rec,
+				 const struct dt_key *key,
 				 struct thandle_exec_args *ta,
 				 struct object_update_reply *reply,
-				 int index, char *file, int line)
+				 int index, const char *file, int line)
 {
 	struct tx_arg	*arg;
 	int		rc;
@@ -936,8 +974,7 @@ static int __out_tx_index_insert(const struct lu_env *env,
 		return rc;
 	}
 
-	rc = dt_declare_insert(env, dt_obj, (struct dt_rec *)fid,
-			       (struct dt_key *)name, ta->ta_handle);
+	rc = dt_declare_insert(env, dt_obj, rec, key, ta->ta_handle);
 	if (rc != 0)
 		return rc;
 
@@ -950,22 +987,23 @@ static int __out_tx_index_insert(const struct lu_env *env,
 	arg->object = dt_obj;
 	arg->reply = reply;
 	arg->index = index;
-	arg->u.insert.rec = (struct dt_rec *)fid;
-	arg->u.insert.key = (struct dt_key *)name;
+	arg->u.insert.rec = *(const struct dt_insert_rec *)rec;
+	arg->u.insert.key = key;
 
 	return 0;
 }
 
 static int out_index_insert(struct tgt_session_info *tsi)
 {
-	struct tgt_thread_info	*tti = tgt_th_info(tsi->tsi_env);
-	struct object_update	*update = tti->tti_u.update.tti_update;
-	struct dt_object  *obj = tti->tti_u.update.tti_dt_object;
-	struct lu_fid	  *fid;
-	char		  *name;
-	int		   rc = 0;
-	int		   size;
-
+	struct tgt_thread_info	*tti	= tgt_th_info(tsi->tsi_env);
+	struct object_update	*update	= tti->tti_u.update.tti_update;
+	struct dt_object	*obj	= tti->tti_u.update.tti_dt_object;
+	struct dt_insert_rec	*rec	= &tti->tti_rec;
+	struct lu_fid		*fid;
+	char			*name;
+	__u32			*ptype;
+	int			 rc	= 0;
+	size_t			 size;
 	ENTRY;
 
 	name = object_update_param_get(update, 0, NULL);
@@ -991,8 +1029,21 @@ static int out_index_insert(struct tgt_session_info *tsi)
 		RETURN(err_serious(-EPROTO));
 	}
 
-	rc = out_tx_index_insert(tsi->tsi_env, obj, name, fid,
-				 &tti->tti_tea,
+	ptype = object_update_param_get(update, 2, &size);
+	if (ptype == NULL || size != sizeof(*ptype)) {
+		CERROR("%s: invalid type for index insert: rc = %d\n",
+		       tgt_name(tsi->tsi_tgt), -EPROTO);
+		RETURN(err_serious(-EPROTO));
+	}
+
+	if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
+		__swab32s(ptype);
+
+	rec->rec_fid = fid;
+	rec->rec_type = *ptype;
+
+	rc = out_tx_index_insert(tsi->tsi_env, obj, (const struct dt_rec *)rec,
+				 (const struct dt_key *)name, &tti->tti_tea,
 				 tti->tti_u.update.tti_update_reply,
 				 tti->tti_u.update.tti_update_reply_index);
 	RETURN(rc);
@@ -1006,7 +1057,7 @@ static int out_tx_index_delete_exec(const struct lu_env *env,
 
 	rc = out_obj_index_delete(env, arg->object, arg->u.insert.key, th);
 
-	CDEBUG(D_INFO, "%s: insert idx insert reply %p index %d: rc = %d\n",
+	CDEBUG(D_INFO, "%s: delete idx insert reply %p index %d: rc = %d\n",
 	       dt_obd_name(th->th_dev), arg->reply, arg->index, rc);
 
 	object_update_result_insert(arg->reply, NULL, 0, arg->index, rc);
@@ -1024,10 +1075,11 @@ static int out_tx_index_delete_undo(const struct lu_env *env,
 }
 
 static int __out_tx_index_delete(const struct lu_env *env,
-				 struct dt_object *dt_obj, char *name,
+				 struct dt_object *dt_obj,
+				 const struct dt_key *key,
 				 struct thandle_exec_args *ta,
 				 struct object_update_reply *reply,
-				 int index, char *file, int line)
+				 int index, const char *file, int line)
 {
 	struct tx_arg	*arg;
 	int		rc;
@@ -1038,8 +1090,7 @@ static int __out_tx_index_delete(const struct lu_env *env,
 	}
 
 	LASSERT(ta->ta_handle != NULL);
-	rc = dt_declare_delete(env, dt_obj, (struct dt_key *)name,
-			       ta->ta_handle);
+	rc = dt_declare_delete(env, dt_obj, key, ta->ta_handle);
 	if (rc != 0)
 		return rc;
 
@@ -1052,7 +1103,7 @@ static int __out_tx_index_delete(const struct lu_env *env,
 	arg->object = dt_obj;
 	arg->reply = reply;
 	arg->index = index;
-	arg->u.insert.key = (struct dt_key *)name;
+	arg->u.insert.key = key;
 	return 0;
 }
 
@@ -1074,7 +1125,8 @@ static int out_index_delete(struct tgt_session_info *tsi)
 		RETURN(err_serious(-EPROTO));
 	}
 
-	rc = out_tx_index_delete(tsi->tsi_env, obj, name, &tti->tti_tea,
+	rc = out_tx_index_delete(tsi->tsi_env, obj, (const struct dt_key *)name,
+				 &tti->tti_tea,
 				 tti->tti_u.update.tti_update_reply,
 				 tti->tti_u.update.tti_update_reply_index);
 	RETURN(rc);
@@ -1107,7 +1159,7 @@ static int out_tx_destroy_undo(const struct lu_env *env, struct thandle *th,
 static int __out_tx_destroy(const struct lu_env *env, struct dt_object *dt_obj,
 			     struct thandle_exec_args *ta,
 			     struct object_update_reply *reply,
-			     int index, char *file, int line)
+			     int index, const char *file, int line)
 {
 	struct tx_arg	*arg;
 	int		rc;
@@ -1179,7 +1231,7 @@ static int __out_tx_write(const struct lu_env *env,
 			  const struct lu_buf *buf,
 			  loff_t pos, struct thandle_exec_args *ta,
 			  struct object_update_reply *reply,
-			  int index, char *file, int line)
+			  int index, const char *file, int line)
 {
 	struct tx_arg	*arg;
 	int		rc;
@@ -1210,8 +1262,8 @@ static int out_write(struct tgt_session_info *tsi)
 	struct lu_buf		*lbuf = &tti->tti_buf;
 	char			*buf;
 	__u64			*tmp;
-	int			size = 0;
-	int			buf_len = 0;
+	size_t			size = 0;
+	size_t			buf_len = 0;
 	loff_t			pos;
 	int			 rc;
 	ENTRY;
@@ -1227,7 +1279,7 @@ static int out_write(struct tgt_session_info *tsi)
 
 	tmp = object_update_param_get(update, 1, &size);
 	if (tmp == NULL || size != sizeof(*tmp)) {
-		CERROR("%s: empty or wrong size %d pos: rc = %d\n",
+		CERROR("%s: empty or wrong size %zd pos: rc = %d\n",
 		       tgt_name(tsi->tsi_tgt), size, -EPROTO);
 		RETURN(err_serious(-EPROTO));
 	}
@@ -1269,6 +1321,8 @@ static struct tgt_handler out_update_ops[] = {
 		     out_attr_get),
 	DEF_OUT_HNDL(OUT_XATTR_SET, "out_xattr_set", MUTABOR | HABEO_REFERO,
 		     out_xattr_set),
+	DEF_OUT_HNDL(OUT_XATTR_DEL, "out_xattr_del", MUTABOR | HABEO_REFERO,
+		     out_xattr_del),
 	DEF_OUT_HNDL(OUT_XATTR_GET, "out_xattr_get", HABEO_REFERO,
 		     out_xattr_get),
 	DEF_OUT_HNDL(OUT_INDEX_LOOKUP, "out_index_lookup", HABEO_REFERO,