landing b_cmobd_merge on HEAD

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

diff --git a/lustre/include/lustre/lustre_user.h b/lustre/include/lustre/lustre_user.h
index f0a839a..804c163 100644 (file)
--- a/lustre/include/lustre/lustre_user.h
+++ b/lustre/include/lustre/lustre_user.h
@@ -20,7 +20,6 @@
  *
  * Lustre public user-space interface definitions.
  */
-
 #ifndef _LUSTRE_USER_H
 #define _LUSTRE_USER_H
 #include <asm/types.h>
@@ -30,6 +29,9 @@
 #include <string.h>
 #endif
 
+#define IOC_MDC_TYPE         'i'
+#define IOC_MDC_GETSTRIPE    _IOWR(IOC_MDC_TYPE, 21, struct lov_mds_md *)
+
 #define LL_IOC_GETFLAGS                 _IOR ('f', 151, long)
 #define LL_IOC_SETFLAGS                 _IOW ('f', 152, long)
 #define LL_IOC_CLRFLAGS                 _IOW ('f', 153, long)
@@ -37,16 +39,16 @@
 #define LL_IOC_LOV_GETSTRIPE            _IOW ('f', 155, long)
 #define LL_IOC_LOV_SETEA                _IOW ('f', 156, long)
 #define LL_IOC_RECREATE_OBJ             _IOW ('f', 157, long)
-#define LL_IOC_GROUP_LOCK               _IOW ('f', 158, long)
-#define LL_IOC_GROUP_UNLOCK             _IOW ('f', 159, long)
-
-#define IOC_MDC_TYPE            'i'
-#define IOC_MDC_GETSTRIPE       _IOWR(IOC_MDC_TYPE, 21, struct lov_mds_md *)
+#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_GROUP_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
@@ -75,6 +77,18 @@ struct lov_user_md_v1 {           /* LOV EA user data (host-endian) */
         struct lov_user_ost_data_v1 lmm_objects[0]; /* per-stripe data */
 } __attribute__((packed));
 
+struct ll_user_mkdir_stripe {
+        int lums_namelen;
+        char *lums_name;
+        mode_t lums_mode;
+        int lums_nstripes;
+};
+
+extern int op_create_file(char *name, long stripe_size, int stripe_offset,
+                          int stripe_count);
+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;