X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fobdo.c;h=9da24053afb34f85cda64215288dd9eb3568aaa0;hb=58f3eb928f563f24f0b3ee41970fa23a59fdcb87;hp=153048a7c9a040873069a490ea22a9542f7c7601;hpb=14c1444535f2474268741795fabcec8541741f31;p=fs%2Flustre-release.git

diff --git a/lustre/obdclass/obdo.c b/lustre/obdclass/obdo.c
index 153048a..9da2405 100644
--- a/lustre/obdclass/obdo.c
+++ b/lustre/obdclass/obdo.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -46,13 +46,84 @@
 #endif
 
 #ifndef __KERNEL__
-#include <liblustre.h>
-#include <obd.h>
+#include "../liblustre/llite_lib.h"
 #else
 #include <obd_class.h>
 #include <lustre/lustre_idl.h>
 #endif
 
+static void obdo_set_parent_fid(struct obdo *dst, struct lu_fid *parent)
+{
+        dst->o_parent_oid = fid_oid(parent);
+        dst->o_parent_seq = fid_seq(parent);
+        dst->o_parent_ver = fid_ver(parent);
+        dst->o_valid |= OBD_MD_FLGENER | OBD_MD_FLFID;
+}
+
+/* WARNING: the file systems must take care not to tinker with
+   attributes they don't manage (such as blocks). */
+void obdo_from_inode(struct obdo *dst, struct inode *src, struct lu_fid *parent,
+                     obd_flag valid)
+{
+        obd_flag newvalid = 0;
+
+        if (valid & (OBD_MD_FLCTIME | OBD_MD_FLMTIME))
+                CDEBUG(D_INODE, "valid %x, new time %lu/%lu\n",
+                       valid, LTIME_S(src->i_mtime),
+                       LTIME_S(src->i_ctime));
+
+        if (valid & OBD_MD_FLATIME) {
+                dst->o_atime = LTIME_S(src->i_atime);
+                newvalid |= OBD_MD_FLATIME;
+        }
+        if (valid & OBD_MD_FLMTIME) {
+                dst->o_mtime = LTIME_S(src->i_mtime);
+                newvalid |= OBD_MD_FLMTIME;
+        }
+        if (valid & OBD_MD_FLCTIME) {
+                dst->o_ctime = LTIME_S(src->i_ctime);
+                newvalid |= OBD_MD_FLCTIME;
+        }
+        if (valid & OBD_MD_FLSIZE) {
+                dst->o_size = src->i_size;
+                newvalid |= OBD_MD_FLSIZE;
+        }
+        if (valid & OBD_MD_FLBLOCKS) {  /* allocation of space (x512 bytes) */
+                dst->o_blocks = src->i_blocks;
+                newvalid |= OBD_MD_FLBLOCKS;
+        }
+        if (valid & OBD_MD_FLBLKSZ) {   /* optimal block size */
+                dst->o_blksize = ll_inode_blksize(src);
+                newvalid |= OBD_MD_FLBLKSZ;
+        }
+        if (valid & OBD_MD_FLTYPE) {
+                dst->o_mode = (dst->o_mode & S_IALLUGO) |
+                              (src->i_mode & S_IFMT);
+                newvalid |= OBD_MD_FLTYPE;
+        }
+        if (valid & OBD_MD_FLMODE) {
+                dst->o_mode = (dst->o_mode & S_IFMT) |
+                              (src->i_mode & S_IALLUGO);
+                newvalid |= OBD_MD_FLMODE;
+        }
+        if (valid & OBD_MD_FLUID) {
+                dst->o_uid = src->i_uid;
+                newvalid |= OBD_MD_FLUID;
+        }
+        if (valid & OBD_MD_FLGID) {
+                dst->o_gid = src->i_gid;
+                newvalid |= OBD_MD_FLGID;
+        }
+        if (valid & OBD_MD_FLFLAGS) {
+                dst->o_flags = ll_inode_flags(src);
+                newvalid |= OBD_MD_FLFLAGS;
+        }
+        if (parent)
+                obdo_set_parent_fid(dst, parent);
+        dst->o_valid |= newvalid;
+}
+EXPORT_SYMBOL(obdo_from_inode);
+
 void obdo_cpy_md(struct obdo *dst, struct obdo *src, obd_flag valid)
 {
 #ifdef __KERNEL__
@@ -81,8 +152,12 @@ void obdo_cpy_md(struct obdo *dst, struct obdo *src, obd_flag valid)
                 dst->o_gid = src->o_gid;
         if (valid & OBD_MD_FLFLAGS)
                 dst->o_flags = src->o_flags;
+        if (valid & OBD_MD_FLFID) {
+                dst->o_parent_seq = src->o_parent_seq;
+                dst->o_parent_ver = src->o_parent_ver;
+        }
         if (valid & OBD_MD_FLGENER)
-                dst->o_generation = src->o_generation;
+                dst->o_parent_oid = src->o_parent_oid;
         if (valid & OBD_MD_FLHANDLE)
                 dst->o_handle = src->o_handle;
         if (valid & OBD_MD_FLCOOKIE)
@@ -121,8 +196,12 @@ int obdo_cmp_md(struct obdo *dst, struct obdo *src, obd_flag compare)
                 res = (res || (dst->o_flags != src->o_flags));
         if ( compare & OBD_MD_FLNLINK )
                 res = (res || (dst->o_nlink != src->o_nlink));
+        if ( compare & OBD_MD_FLFID ) {
+                res = (res || (dst->o_parent_seq != src->o_parent_seq));
+                res = (res || (dst->o_parent_ver != src->o_parent_ver));
+        }
         if ( compare & OBD_MD_FLGENER )
-                res = (res || (dst->o_generation != src->o_generation));
+                res = (res || (dst->o_parent_oid != src->o_parent_oid));
         /* XXX Don't know if thses should be included here - wasn't previously
         if ( compare & OBD_MD_FLINLINE )
                 res = (res || memcmp(dst->o_inline, src->o_inline));
@@ -135,9 +214,9 @@ void obdo_to_ioobj(struct obdo *oa, struct obd_ioobj *ioobj)
 {
         ioobj->ioo_id = oa->o_id;
         if (oa->o_valid & OBD_MD_FLGROUP)
-                ioobj->ioo_gr = oa->o_gr;
-        else 
-                ioobj->ioo_gr = 0;
+                ioobj->ioo_seq = oa->o_seq;
+        else
+                ioobj->ioo_seq = 0;
         ioobj->ioo_type = oa->o_mode;
 }
 EXPORT_SYMBOL(obdo_to_ioobj);
@@ -163,7 +242,8 @@ void obdo_from_iattr(struct obdo *oa, struct iattr *attr, unsigned int ia_valid)
         if (ia_valid & ATTR_MODE) {
                 oa->o_mode = attr->ia_mode;
                 oa->o_valid |= OBD_MD_FLTYPE | OBD_MD_FLMODE;
-                if (!in_group_p(oa->o_gid) && !cfs_capable(CFS_CAP_FSETID))
+                if (!cfs_curproc_is_in_groups(oa->o_gid) &&
+                    !cfs_capable(CFS_CAP_FSETID))
                         oa->o_mode &= ~S_ISGID;
         }
         if (ia_valid & ATTR_UID) {
@@ -211,7 +291,8 @@ void iattr_from_obdo(struct iattr *attr, struct obdo *oa, obd_flag valid)
         if (valid & OBD_MD_FLMODE) {
                 attr->ia_mode = (attr->ia_mode & S_IFMT)|(oa->o_mode & ~S_IFMT);
                 attr->ia_valid |= ATTR_MODE;
-                if (!in_group_p(oa->o_gid) && !cfs_capable(CFS_CAP_FSETID))
+                if (!cfs_curproc_is_in_groups(oa->o_gid) &&
+                    !cfs_capable(CFS_CAP_FSETID))
                         attr->ia_mode &= ~S_ISGID;
         }
         if (valid & OBD_MD_FLUID) {