b=1028 drop SOM dependency on quota

[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 0777e2a..8948c7f 100644 (file)
--- a/lustre/include/lustre/lustre_user.h
+++ b/lustre/include/lustre/lustre_user.h
@@ -342,8 +342,6 @@ typedef struct lu_fid lustre_fid;
 #define LUSTRE_Q_FINVALIDATE 0x80000c     /* invalidate filter quota data */
 
 #define UGQUOTA 2       /* set both USRQUOTA and GRPQUOTA */
-#define IMMQUOTA 0x4    /* set immutable quota flag, cannot be turned on/off
-                         * on-fly. temporary used by SOM */
 
 struct if_quotacheck {
         char                    obd_type[16];
@@ -522,6 +520,11 @@ enum changelog_message_type {
 
 
 /********* HSM **********/
+
+
+#define HSM_FLAGS_MASK  0
+
+
 enum hsm_message_type {
         HMT_ACTION_LIST = 100, /* message is a hsm_action_list */
 };
@@ -572,13 +575,14 @@ struct hsm_action_list {
 static __inline__ struct hsm_action_item * hai_zero(struct hsm_action_list *hal)
 {
         return (struct hsm_action_item *)(hal->hal_fsname +
-                                          size_round(strlen(hal->hal_fsname)));
+                                          cfs_size_round(strlen(hal-> \
+                                                                hal_fsname)));
 }
 /* Return pointer to next hai */
 static __inline__ struct hsm_action_item * hai_next(struct hsm_action_item *hai)
 {
         return (struct hsm_action_item *)((char *)hai +
-                                          size_round(hai->hai_len));
+                                          cfs_size_round(hai->hai_len));
 }