LU-5732 hsm: complementary testsuite for user HSM API

[fs/lustre-release.git] / lustre / obdclass / obdo.c

diff --git a/lustre/obdclass/obdo.c b/lustre/obdclass/obdo.c
index 7cf1ca0..ac586d4 100644 (file)
--- a/lustre/obdclass/obdo.c
+++ b/lustre/obdclass/obdo.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -42,12 +42,8 @@
 
 #define DEBUG_SUBSYSTEM S_CLASS
 
-#ifndef __KERNEL__
-#include "../liblustre/llite_lib.h"
-#else
 #include <obd_class.h>
 #include <lustre/lustre_idl.h>
-#endif
 
 void obdo_set_parent_fid(struct obdo *dst, const struct lu_fid *parent)
 {
@@ -60,9 +56,9 @@ EXPORT_SYMBOL(obdo_set_parent_fid);
 
 /* 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, obd_flag valid)
+void obdo_from_inode(struct obdo *dst, struct inode *src, u32 valid)
 {
-        obd_flag newvalid = 0;
+       u32 newvalid = 0;
 
         if (valid & (OBD_MD_FLCTIME | OBD_MD_FLMTIME))
                 CDEBUG(D_INODE, "valid %x, new time %lu/%lu\n",
@@ -90,7 +86,7 @@ void obdo_from_inode(struct obdo *dst, struct inode *src, obd_flag valid)
                 newvalid |= OBD_MD_FLBLOCKS;
         }
         if (valid & OBD_MD_FLBLKSZ) {   /* optimal block size */
-                dst->o_blksize = ll_inode_blksize(src);
+               dst->o_blksize = 1U << src->i_blkbits;
                 newvalid |= OBD_MD_FLBLKSZ;
         }
         if (valid & OBD_MD_FLTYPE) {
@@ -112,19 +108,17 @@ void obdo_from_inode(struct obdo *dst, struct inode *src, obd_flag valid)
                newvalid |= OBD_MD_FLGID;
        }
        if (valid & OBD_MD_FLFLAGS) {
-               dst->o_flags = ll_inode_flags(src);
+               dst->o_flags = src->i_flags;
                newvalid |= OBD_MD_FLFLAGS;
        }
        dst->o_valid |= newvalid;
 }
 EXPORT_SYMBOL(obdo_from_inode);
 
-void obdo_cpy_md(struct obdo *dst, const struct obdo *src, obd_flag valid)
+void obdo_cpy_md(struct obdo *dst, const struct obdo *src, u32 valid)
 {
-#ifdef __KERNEL__
         CDEBUG(D_INODE, "src obdo "DOSTID" valid "LPX64", dst obdo "DOSTID"\n",
                POSTID(&src->o_oi), src->o_valid, POSTID(&dst->o_oi));
-#endif
         if (valid & OBD_MD_FLATIME)
                 dst->o_atime = src->o_atime;
         if (valid & OBD_MD_FLMTIME)
@@ -175,7 +169,7 @@ void obdo_to_ioobj(const struct obdo *oa, struct obd_ioobj *ioobj)
 EXPORT_SYMBOL(obdo_to_ioobj);
 
 static void iattr_from_obdo(struct iattr *attr, const struct obdo *oa,
-                           obd_flag valid)
+                           u32 valid)
 {
         valid &= oa->o_valid;
 
@@ -224,7 +218,7 @@ static void iattr_from_obdo(struct iattr *attr, const struct obdo *oa,
 }
 
 void md_from_obdo(struct md_op_data *op_data, const struct obdo *oa,
-                 obd_flag valid)
+                 u32 valid)
 {
         iattr_from_obdo(&op_data->op_attr, oa, valid);
         if (valid & OBD_MD_FLBLOCKS) {
@@ -232,8 +226,7 @@ void md_from_obdo(struct md_op_data *op_data, const struct obdo *oa,
                 op_data->op_attr.ia_valid |= ATTR_BLOCKS;
         }
         if (valid & OBD_MD_FLFLAGS) {
-                ((struct ll_iattr *)&op_data->op_attr)->ia_attr_flags =
-                        oa->o_flags;
+               op_data->op_attr_flags = oa->o_flags;
                 op_data->op_attr.ia_valid |= ATTR_ATTR_FLAG;
         }
 }