LU-1812 ext4: ec_type has been dropped from ext4_ext_cache

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

diff --git a/lustre/obdclass/obdo.c b/lustre/obdclass/obdo.c
index 2fb154c..a0175aa 100644 (file)
--- a/lustre/obdclass/obdo.c
+++ b/lustre/obdclass/obdo.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -41,9 +41,6 @@
  */
 
 #define DEBUG_SUBSYSTEM S_CLASS
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 
 #ifndef __KERNEL__
 #include "../liblustre/llite_lib.h"
@@ -52,18 +49,18 @@
 #include <lustre/lustre_idl.h>
 #endif
 
-static void obdo_set_parent_fid(struct obdo *dst, struct lu_fid *parent)
+void obdo_set_parent_fid(struct obdo *dst, const 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;
 }
+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, struct lu_fid *parent,
-                     obd_flag valid)
+void obdo_from_inode(struct obdo *dst, struct inode *src, obd_flag valid)
 {
         obd_flag newvalid = 0;
 
@@ -118,8 +115,6 @@ void obdo_from_inode(struct obdo *dst, struct inode *src, struct lu_fid *parent,
                 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);
@@ -212,12 +207,14 @@ 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_type = oa->o_mode;
+       ioobj->ioo_id = oa->o_id;
+       if (oa->o_valid & OBD_MD_FLGROUP)
+               ioobj->ioo_seq = oa->o_seq;
+       else
+               ioobj->ioo_seq = 0;
+       /* 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;
 }
 EXPORT_SYMBOL(obdo_to_ioobj);
 
@@ -336,3 +333,38 @@ 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);
+