X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre%2Flustreapi.h;h=f4e92c2dbee699025f8a43cf8681fcdda1d2afd6;hb=ae295503f53e867e11dc51b217f336e8b20d119f;hp=98cbf80f99022017790cc64bff28d260c755d331;hpb=3b18568dc07dac8550c36b33afb45dde2403ea49;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre/lustreapi.h b/lustre/include/lustre/lustreapi.h
index 98cbf80..f4e92c2 100644
--- a/lustre/include/lustre/lustreapi.h
+++ b/lustre/include/lustre/lustreapi.h
@@ -42,9 +42,11 @@
  * @{
  */
 
+#include <stdarg.h>
 #include <lustre/lustre_user.h>
 
-typedef void (*llapi_cb_t)(char *obd_type_name, char *obd_name, char *obd_uuid, void *args);
+typedef void (*llapi_cb_t)(char *obd_type_name, char *obd_name, char *obd_uuid,
+			   void *args);
 
 /* lustreapi message severity level */
 enum llapi_message_level {
@@ -58,17 +60,23 @@ enum llapi_message_level {
         LLAPI_MSG_MAX
 };
 
+typedef void (*llapi_log_callback_t)(enum llapi_message_level level, int err,
+				     const char *fmt, va_list ap);
+
+
 /* the bottom three bits reserved for llapi_message_level */
 #define LLAPI_MSG_MASK          0x00000007
 #define LLAPI_MSG_NO_ERRNO      0x00000010
 
 extern void llapi_msg_set_level(int level);
+extern llapi_log_callback_t llapi_error_callback_set(llapi_log_callback_t cb);
+extern llapi_log_callback_t llapi_info_callback_set(llapi_log_callback_t cb);
 
-void llapi_error(int level, int rc, const char *fmt, ...)
+void llapi_error(enum llapi_message_level level, int err, const char *fmt, ...)
 	__attribute__((__format__(__printf__, 3, 4)));
 #define llapi_err_noerrno(level, fmt, a...)			\
 	llapi_error((level) | LLAPI_MSG_NO_ERRNO, 0, fmt, ## a)
-void llapi_printf(int level, const char *fmt, ...)
+void llapi_printf(enum llapi_message_level level, const char *fmt, ...)
 	__attribute__((__format__(__printf__, 2, 3)));
 
 extern int llapi_file_create(const char *name, unsigned long long stripe_size,
@@ -234,6 +242,7 @@ extern void llapi_ping_target(char *obd_type, char *obd_name,
                               char *obd_uuid, void *args);
 
 extern int llapi_search_rootpath(char *pathname, const char *fsname);
+extern int llapi_nodemap_exists(const char *name);
 
 struct mntent;
 #define HAVE_LLAPI_IS_LUSTRE_MNT
@@ -317,8 +326,8 @@ extern int llapi_hsm_action_begin(struct hsm_copyaction_private **phcp,
 				  int restore_mdt_index, int restore_open_flags,
 				  bool is_error);
 extern int llapi_hsm_action_end(struct hsm_copyaction_private **phcp,
-				const struct hsm_extent *he, int flags,
-				int errval);
+				const struct hsm_extent *he,
+				int hp_flags, int errval);
 extern int llapi_hsm_action_progress(struct hsm_copyaction_private *hcp,
 				     const struct hsm_extent *he, int hp_flags);
 extern int llapi_hsm_action_get_dfid(const struct hsm_copyaction_private *hcp,