LU-3539 osp: Fix a series of UPDATE_OBJ endianness bugs

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

diff --git a/lustre/obdclass/obdo.c b/lustre/obdclass/obdo.c
index a0175aa..e99b17a 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) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -122,8 +122,8 @@ EXPORT_SYMBOL(obdo_from_inode);
 void obdo_cpy_md(struct obdo *dst, struct obdo *src, obd_flag valid)
 {
 #ifdef __KERNEL__
-        CDEBUG(D_INODE, "src obdo "LPX64" valid "LPX64", dst obdo "LPX64"\n",
-               src->o_id, src->o_valid, dst->o_id);
+        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;
@@ -207,11 +207,10 @@ EXPORT_SYMBOL(obdo_cmp_md);
 
 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_seq = oa->o_seq;
-       else
-               ioobj->ioo_seq = 0;
+       ioobj->ioo_oid = oa->o_oi;
+       if (unlikely(!(oa->o_valid & OBD_MD_FLGROUP)))
+               ostid_set_seq_mdt0(&ioobj->ioo_oid);
+
        /* Since 2.4 this does not contain o_mode in the low 16 bits.
         * Instead, it holds (bd_md_max_brw - 1) for multi-bulk BRW RPCs */
        ioobj->ioo_max_brw = 0;
@@ -236,13 +235,13 @@ void obdo_from_iattr(struct obdo *oa, struct iattr *attr, unsigned int ia_valid)
                 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_FLTYPE | OBD_MD_FLMODE;
-                if (!cfs_curproc_is_in_groups(oa->o_gid) &&
-                    !cfs_capable(CFS_CAP_FSETID))
-                        oa->o_mode &= ~S_ISGID;
-        }
+       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))
+                       oa->o_mode &= ~S_ISGID;
+       }
         if (ia_valid & ATTR_UID) {
                 oa->o_uid = attr->ia_uid;
                 oa->o_valid |= OBD_MD_FLUID;
@@ -286,11 +285,11 @@ void iattr_from_obdo(struct iattr *attr, struct obdo *oa, obd_flag valid)
         }
 #endif
         if (valid & OBD_MD_FLMODE) {
-                attr->ia_mode = (attr->ia_mode & S_IFMT)|(oa->o_mode & ~S_IFMT);
-                attr->ia_valid |= ATTR_MODE;
-                if (!cfs_curproc_is_in_groups(oa->o_gid) &&
-                    !cfs_capable(CFS_CAP_FSETID))
-                        attr->ia_mode &= ~S_ISGID;
+               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))
+                       attr->ia_mode &= ~S_ISGID;
         }
         if (valid & OBD_MD_FLUID) {
                 attr->ia_uid = oa->o_uid;
@@ -333,38 +332,3 @@ void obdo_from_md(struct obdo *oa, struct md_op_data *op_data,
         }
 }
 EXPORT_SYMBOL(obdo_from_md);
-
-void obdo_cpu_to_le(struct obdo *dobdo, struct obdo *sobdo)
-{
-       dobdo->o_size = cpu_to_le64(sobdo->o_size);
-       dobdo->o_mtime = cpu_to_le64(sobdo->o_mtime);
-       dobdo->o_atime = cpu_to_le64(sobdo->o_atime);
-       dobdo->o_ctime = cpu_to_le64(sobdo->o_ctime);
-       dobdo->o_blocks = cpu_to_le64(sobdo->o_blocks);
-       dobdo->o_mode = cpu_to_le32(sobdo->o_mode);
-       dobdo->o_uid = cpu_to_le32(sobdo->o_uid);
-       dobdo->o_gid = cpu_to_le32(sobdo->o_gid);
-       dobdo->o_flags = cpu_to_le32(sobdo->o_flags);
-       dobdo->o_nlink = cpu_to_le32(sobdo->o_nlink);
-       dobdo->o_blksize = cpu_to_le32(sobdo->o_blksize);
-       dobdo->o_valid = cpu_to_le64(sobdo->o_valid);
-}
-EXPORT_SYMBOL(obdo_cpu_to_le);
-
-void obdo_le_to_cpu(struct obdo *dobdo, struct obdo *sobdo)
-{
-       dobdo->o_size = le64_to_cpu(sobdo->o_size);
-       dobdo->o_mtime = le64_to_cpu(sobdo->o_mtime);
-       dobdo->o_atime = le64_to_cpu(sobdo->o_atime);
-       dobdo->o_ctime = le64_to_cpu(sobdo->o_ctime);
-       dobdo->o_blocks = le64_to_cpu(sobdo->o_blocks);
-       dobdo->o_mode = le32_to_cpu(sobdo->o_mode);
-       dobdo->o_uid = le32_to_cpu(sobdo->o_uid);
-       dobdo->o_gid = le32_to_cpu(sobdo->o_gid);
-       dobdo->o_flags = le32_to_cpu(sobdo->o_flags);
-       dobdo->o_nlink = le32_to_cpu(sobdo->o_nlink);
-       dobdo->o_blksize = le32_to_cpu(sobdo->o_blksize);
-       dobdo->o_valid = le64_to_cpu(sobdo->o_valid);
-}
-EXPORT_SYMBOL(obdo_le_to_cpu);
-