Generation added to obdo

[fs/lustre-release.git] / lustre / include / linux / obd_class.h

diff --git a/lustre/include/linux/obd_class.h b/lustre/include/linux/obd_class.h
index 6ea3e80..596e0be 100644 (file)
--- a/lustre/include/linux/obd_class.h
+++ b/lustre/include/linux/obd_class.h
@@ -34,7 +34,7 @@ typedef uint32_t      obd_count;
 #define OBD_FL_OBDMDEXISTS     (1UL << 1)
 
 #define OBD_INLINESZ   60
-#define OBD_OBDMDSZ    64
+#define OBD_OBDMDSZ    60
 /* Note: 64-bit types are 64-bit aligned in structure */
 struct obdo {
        obd_id                  o_id;
@@ -51,6 +51,7 @@ struct obdo {
        obd_flag                o_flags;
        obd_flag                o_obdflags;
        obd_count               o_nlink;
+       obd_count               o_generation;
        obd_flag                o_valid;        /* hot fields in this obdo */
        char                    o_inline[OBD_INLINESZ];
        char                    o_obdmd[OBD_OBDMDSZ];
@@ -72,8 +73,9 @@ struct obdo {
 #define OBD_MD_FLFLAGS (1UL<<10)
 #define OBD_MD_FLOBDFLG        (1UL<<11)
 #define OBD_MD_FLNLINK (1UL<<12)
-#define OBD_MD_FLINLINE        (1UL<<13)
-#define OBD_MD_FLOBDMD (1UL<<14)
+#define OBD_MD_FLGENER (1UL<<13)
+#define OBD_MD_FLINLINE        (1UL<<14)
+#define OBD_MD_FLOBDMD (1UL<<15)
 
 /*
  *  ======== OBD Device Declarations ===========
@@ -157,6 +159,7 @@ struct obd_ops {
  */
 
 extern int obd_init_obdo_cache(void);
+extern void obd_cleanup_obdo_cache(void);
 
 
 static inline int obdo_has_inline(struct obdo *obdo)
@@ -211,6 +214,42 @@ static __inline__ struct obdo *obdo_fromid(struct obd_conn *conn, obd_id id)
        return res;
 }
 
+static inline void obdo_from_iattr(struct obdo *oa, struct iattr *attr)
+{
+       unsigned int ia_valid = attr->ia_valid;
+
+       if (ia_valid & ATTR_ATIME) {
+               oa->o_atime = attr->ia_atime;
+               oa->o_valid |= OBD_MD_FLATIME;
+       }
+       if (ia_valid & ATTR_MTIME) {
+               oa->o_mtime = attr->ia_mtime;
+               oa->o_valid |= OBD_MD_FLMTIME;
+       }
+       if (ia_valid & ATTR_CTIME) {
+               oa->o_ctime = attr->ia_ctime;
+               oa->o_valid |= OBD_MD_FLCTIME;
+       }
+       if (ia_valid & ATTR_SIZE) {
+               oa->o_size = attr->ia_size;
+               oa->o_valid |= OBD_MD_FLSIZE;
+       }
+       if (ia_valid & ATTR_MODE) {
+               oa->o_mode = attr->ia_mode;
+               oa->o_valid |= OBD_MD_FLMODE;
+               if (!in_group_p(oa->o_gid) && !capable(CAP_FSETID))
+                       oa->o_mode &= ~S_ISGID;
+       }
+       if (ia_valid & ATTR_UID)
+       {
+               oa->o_uid = attr->ia_uid;
+               oa->o_valid |= OBD_MD_FLUID;
+       }
+       if (ia_valid & ATTR_GID) {
+               oa->o_gid = attr->ia_gid;
+               oa->o_valid |= OBD_MD_FLGID;
+       }
+}
 
 
 static __inline__ void obdo_cpy_md(struct obdo *dst, struct obdo *src)
@@ -240,6 +279,8 @@ static __inline__ void obdo_cpy_md(struct obdo *dst, struct obdo *src)
                dst->o_obdflags = src->o_obdflags;
        if ( src->o_valid & OBD_MD_FLNLINK ) 
                dst->o_nlink = src->o_nlink;
+       if ( src->o_valid & OBD_MD_FLGENER ) 
+               dst->o_generation = src->o_generation;
        if ( src->o_valid & OBD_MD_FLINLINE ) 
                memcpy(dst->o_inline, src->o_inline, sizeof(src->o_inline));
        if ( src->o_valid & OBD_MD_FLOBDMD ) 
@@ -273,6 +314,10 @@ static __inline__ void obdo_from_inode(struct obdo *dst, struct inode *src)
                dst->o_gid = src->i_gid;
        if ( dst->o_valid & OBD_MD_FLFLAGS )
                dst->o_flags = src->i_flags;
+       if ( dst->o_valid & OBD_MD_FLNLINK )
+               dst->o_nlink = src->i_nlink;
+       if ( dst->o_valid & OBD_MD_FLGENER ) 
+               dst->o_generation = src->i_generation;
 }
 
 static __inline__ void obdo_to_inode(struct inode *dst, struct obdo *src)
@@ -287,6 +332,8 @@ static __inline__ void obdo_to_inode(struct inode *dst, struct obdo *src)
                dst->i_mtime = src->o_mtime;
        if ( src->o_valid & OBD_MD_FLCTIME ) 
                dst->i_ctime = src->o_ctime;
+       if ( src->o_valid & OBD_MD_FLSIZE ) 
+               dst->i_size = src->o_size;
        if ( src->o_valid & OBD_MD_FLBLOCKS ) /* allocation of space */
                dst->i_blocks = src->o_blocks;
        if ( src->o_valid & OBD_MD_FLBLKSZ )
@@ -297,10 +344,12 @@ static __inline__ void obdo_to_inode(struct inode *dst, struct obdo *src)
                dst->i_uid = src->o_uid;
        if ( src->o_valid & OBD_MD_FLGID ) 
                dst->i_gid = src->o_gid;
-       if ( src->o_valid & OBD_MD_FLSIZE ) 
-               dst->i_size = src->o_size;
        if ( src->o_valid & OBD_MD_FLFLAGS ) 
                dst->i_flags = src->o_flags;
+       if ( src->o_valid & OBD_MD_FLNLINK )
+               dst->i_nlink = src->o_nlink;
+       if ( src->o_valid & OBD_MD_FLGENER )
+               dst->i_generation = src->o_generation;
 }
 
 static __inline__ int obdo_cmp_md(struct obdo *dst, struct obdo *src)