landing b_cmobd_merge on HEAD

[fs/lustre-release.git] / lustre / include / lustre / lustre_user.h

diff --git a/lustre/include/linux/lustre_user.h b/lustre/include/lustre/lustre_user.h
similarity index 78%
rename from lustre/include/linux/lustre_user.h
rename to lustre/include/lustre/lustre_user.h
index c380fe9..804c163 100644 (file)
--- a/lustre/include/linux/lustre_user.h
+++ b/lustre/include/lustre/lustre_user.h
@@ -20,10 +20,14 @@
  *
  * Lustre public user-space interface definitions.
  */
-
 #ifndef _LUSTRE_USER_H
 #define _LUSTRE_USER_H
 #include <asm/types.h>
+#ifdef __KERNEL__
+#include <linux/string.h>
+#else
+#include <string.h>
+#endif
 
 #define IOC_MDC_TYPE         'i'
 #define IOC_MDC_GETSTRIPE    _IOWR(IOC_MDC_TYPE, 21, struct lov_mds_md *)
@@ -38,11 +42,13 @@
 #define LL_IOC_CW_LOCK                  _IOW ('f', 158, long)
 #define LL_IOC_CW_UNLOCK                _IOW ('f', 159, long)
 #define LL_IOC_MDC_MKDIRSTRIPE          _IOW ('f', 160, long)
+#define LL_IOC_GROUP_LOCK               _IOW ('f', 161, long)
+#define LL_IOC_GROUP_UNLOCK             _IOW ('f', 162, long)
 
-#define O_LOV_DELAY_CREATE 0100000000  /* hopefully this does not conflict */
+#define O_LOV_DELAY_CREATE    0100000000  /* hopefully this does not conflict */
 
-#define LL_FILE_IGNORE_LOCK             0x00000001
-#define LL_FILE_CW_LOCKED               0x00000002
+#define LL_FILE_IGNORE_LOCK   0x00000001
+#define LL_FILE_GROUP_LOCKED  0x00000002
 
 #define LOV_USER_MAGIC_V1 0x0BD10BD0
 #define LOV_USER_MAGIC    LOV_USER_MAGIC_V1
@@ -55,9 +61,8 @@
 struct lov_user_ost_data_v1 {     /* per-stripe data structure */
         __u64 l_object_id;       /* OST object ID */
         __u64 l_object_gr;        /* OST object group (creating MDS number) */
-        __u32 l_ost_generation;   /* generation of this OST index */
-        __u16 l_ost_idx;          /* OST index in LOV */
-        __u16 l_reserved2;
+        __u32 l_ost_gen;          /* generation of this OST index */
+        __u32 l_ost_idx;          /* OST index in LOV */
 } __attribute__((packed));
 
 #define lov_user_md lov_user_md_v1
@@ -84,4 +89,24 @@ extern int op_create_file(char *name, long stripe_size, int stripe_offset,
 extern int op_create_dir(char *name, int stripe_count);
 extern int get_file_stripe(char *path, struct lov_user_md *lum);
 
+struct ll_recreate_obj {
+        __u64 lrc_id;
+        __u32 lrc_ost_idx;
+};
+
+struct obd_uuid {
+        __u8 uuid[40];
+};
+
+static inline int obd_uuid_equals(struct obd_uuid *u1, struct obd_uuid *u2)
+{
+        return strcmp(u1->uuid, u2->uuid) == 0;
+}
+
+static inline void obd_str2uuid(struct obd_uuid *uuid, char *tmp)
+{
+        strncpy(uuid->uuid, tmp, sizeof(*uuid));
+        uuid->uuid[sizeof(*uuid) - 1] = '\0';
+}
+
 #endif /* _LUSTRE_USER_H */